Packman Build Service PMBS

sview.changes Changed

sview.spec Changed

sview-15_10.tar.gz/3rdparty/FFmpeg/patches/patch_dxva.patch Deleted

@@ -1,1743 +0,0 @@
-From dad9d95e75f601c9b8864724bf68cf4a7f63ccaa Mon Sep 17 00:00:00 2001
-From: Kirill Gavrilov <kirill@sview.ru>
-Date: Wed, 7 Jan 2015 11:33:03 +0400
-Subject: [PATCH] lavc/dxva2: add ffmpeg calling dxva2 APIs
-
-Signed-off-by: weixuan wang <batmanwwx@gmail.com>
----
- configure | 4 +
- libavcodec/Makefile | 4 +
- libavcodec/allcodecs.c | 4 +
- libavcodec/dxva2_dec.c | 356 +++++++++++++++++++++
- libavcodec/dxva2_wrapper.c | 777 +++++++++++++++++++++++++++++++++++++++++++++
- libavcodec/dxva2_wrapper.h | 389 +++++++++++++++++++++++
- libavcodec/mpeg12.h | 23 ++
- libavcodec/mpeg12dec.c | 20 --
- 8 files changed, 1557 insertions(+), 20 deletions(-)
- create mode 100644 libavcodec/dxva2_dec.c
- create mode 100644 libavcodec/dxva2_wrapper.c
- create mode 100644 libavcodec/dxva2_wrapper.h
-
-diff --git a/configure b/configure
-index c046e34..088a3d4 100755
---- a/configure
-+++ b/configure
-@@ -2273,6 +2273,7 @@ h263_vaapi_hwaccel_select="h263_decoder"
- h263_vdpau_hwaccel_deps="vdpau"
- h263_vdpau_hwaccel_select="h263_decoder"
- h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
-+h264_dxva2_decoder_select="dxva2 h264_parser h264_decoder h264_dxva2_hwaccel"
- h264_dxva2_hwaccel_deps="dxva2"
- h264_dxva2_hwaccel_select="h264_decoder"
- h264_vaapi_hwaccel_deps="vaapi"
-@@ -2304,6 +2305,7 @@ mpeg2_vaapi_hwaccel_deps="vaapi"
- mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
- mpeg2_vdpau_hwaccel_deps="vdpau"
- mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
-+mpeg2video_dxva2_decoder_select="dxva2 mpeg2video_decoder mpeg2_dxva2_hwaccel"
- mpeg2_xvmc_hwaccel_deps="xvmc"
- mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
- mpeg4_crystalhd_decoder_select="crystalhd"
-@@ -2315,6 +2317,7 @@ mpeg4_vdpau_hwaccel_deps="vdpau"
- mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
- msmpeg4_crystalhd_decoder_select="crystalhd"
- vc1_crystalhd_decoder_select="crystalhd"
-+vc1_dxva2_decoder_select="dxva2 vc1_decoder vc1_dxva2_hwaccel"
- vc1_dxva2_hwaccel_deps="dxva2"
- vc1_dxva2_hwaccel_select="vc1_decoder"
- vc1_vaapi_hwaccel_deps="vaapi"
-@@ -2324,6 +2327,7 @@ vc1_vdpau_decoder_select="vc1_decoder"
- vc1_vdpau_hwaccel_deps="vdpau"
- vc1_vdpau_hwaccel_select="vc1_decoder"
- wmv3_crystalhd_decoder_select="crystalhd"
-+wmv3_dxva2_decoder_select="dxva2 wmv3_decoder wmv3_dxva2_hwaccel"
- wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
- wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
- wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index fa0f53d..ffbb77c 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -259,6 +259,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264.o h264_cabac.o h264_cavlc.o \
- h264_direct.o h264_loopfilter.o \
- h264_mb.o h264_picture.o h264_ps.o \
- h264_refs.o h264_sei.o h264_slice.o
-+OBJS-$(CONFIG_H264_DXVA2_DECODER) += dxva2_wrapper.o dxva2_dec.o
- OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o
- OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
- hevc_cabac.o hevc_refs.o hevcpred.o \
-@@ -325,6 +326,7 @@ OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
- OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
- OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
- OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
-+OBJS-$(CONFIG_MPEG2VIDEO_DXVA2_DECODER)+= dxva2_wrapper.o dxva2_dec.o
- OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
- OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o
- OBJS-$(CONFIG_MPL2_DECODER) += mpl2dec.o ass.o
-@@ -482,6 +484,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o
- vc1dsp.o \
- msmpeg4dec.o msmpeg4.o msmpeg4data.o \
- wmv2dsp.o
-+OBJS-$(CONFIG_VC1_DXVA2_DECODER) += dxva2_wrapper.o dxva2_dec.o
- OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
- OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o
- OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o
-@@ -521,6 +524,7 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2dsp.o \
- msmpeg4dec.o msmpeg4.o msmpeg4data.o
- OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \
- msmpeg4.o msmpeg4enc.o msmpeg4data.o
-+OBJS-$(CONFIG_WMV3_DXVA2_DECODER) += dxva2_wrapper.o dxva2_dec.o
- OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
- OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
- OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o
-diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index 0d39d33..548f0ef 100644
---- a/libavcodec/allcodecs.c
-+++ b/libavcodec/allcodecs.c
-@@ -169,6 +169,7 @@ void avcodec_register_all(void)
- REGISTER_ENCDEC (H263P, h263p);
- REGISTER_DECODER(H264, h264);
- REGISTER_DECODER(H264_CRYSTALHD, h264_crystalhd);
-+ REGISTER_DECODER (H264_DXVA2, h264_dxva2);
- REGISTER_DECODER(H264_VDA, h264_vda);
- REGISTER_DECODER(H264_VDPAU, h264_vdpau);
- REGISTER_DECODER(HEVC, hevc);
-@@ -201,6 +202,7 @@ void avcodec_register_all(void)
- #endif /* FF_API_XVMC */
- REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
- REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
-+ REGISTER_DECODER (MPEG2VIDEO_DXVA2, mpeg2video_dxva2);
- REGISTER_ENCDEC (MPEG4, mpeg4);
- REGISTER_DECODER(MPEG4_CRYSTALHD, mpeg4_crystalhd);
- REGISTER_DECODER(MPEG4_VDPAU, mpeg4_vdpau);
-@@ -285,6 +287,7 @@ void avcodec_register_all(void)
- REGISTER_DECODER(VBLE, vble);
- REGISTER_DECODER(VC1, vc1);
- REGISTER_DECODER(VC1_CRYSTALHD, vc1_crystalhd);
-+ REGISTER_DECODER (VC1_DXVA2, vc1_dxva2);
- REGISTER_DECODER(VC1_VDPAU, vc1_vdpau);
- REGISTER_DECODER(VC1IMAGE, vc1image);
- REGISTER_DECODER(VCR1, vcr1);
-@@ -304,6 +307,7 @@ void avcodec_register_all(void)
- REGISTER_ENCDEC (WMV2, wmv2);
- REGISTER_DECODER(WMV3, wmv3);
- REGISTER_DECODER(WMV3_CRYSTALHD, wmv3_crystalhd);
-+ REGISTER_DECODER (WMV3_DXVA2, wmv3_dxva2);
- REGISTER_DECODER(WMV3_VDPAU, wmv3_vdpau);
- REGISTER_DECODER(WMV3IMAGE, wmv3image);
- REGISTER_DECODER(WNV1, wnv1);
-diff --git a/libavcodec/dxva2_dec.c b/libavcodec/dxva2_dec.c
-new file mode 100644
-index 0000000..e6b31cf
---- /dev/null
-+++ b/libavcodec/dxva2_dec.c
-@@ -0,0 +1,356 @@
-+/*
-+ * Call hardware decode acceleration through dxva2 API
-+ *
-+ * Copyright (c) 2012 Wei Gao <weigao@multicorewareinc.com>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include <string.h>
-+#include "dxva2_wrapper.h"
-+#include "h264.h"
-+#include "vc1.h"
-+#include "mpeg12.h"
-+#include "avcodec.h"
-+#include "internal.h"
-+
-+#if CONFIG_H264_DXVA2_DECODER
-+extern AVCodec ff_h264_decoder,ff_h264_dxva2_decoder;
-+#endif
-+
-+#if CONFIG_MPEG2VIDEO_DXVA2_DECODER
-+extern AVCodec ff_mpeg2video_decoder,ff_mpeg2video_dxva2_decoder;
-+#endif
-+
-+#if CONFIG_VC1_DXVA2_DECODER
-+extern AVCodec ff_vc1_decoder,ff_vc1_dxva2_decoder;
-+#endif
-+
-+#if CONFIG_WMV3_DXVA2_DECODER
-+extern AVCodec ff_wmv3_decoder, ff_wmv3_dxva2_decoder;
-+#endif
-+
-+typedef union {
-+#if CONFIG_H264_DXVA2_DECODER
-+ H264Context h264ctx;
-+#endif
-+#if CONFIG_VC1_DXVA2_DECODER || CONFIG_WMV3_DXVA2_DECODER
-+ VC1Context vc1ctx;
-+#endif
-+#if CONFIG_MPEG2VIDEO_DXVA2_DECODER
-+ Mpeg1Context mpeg2videoctx;
-+#endif
-+}DecoderContext;
-+
-+typedef struct {
-+ DecoderContext decoderctx;
-+ enum AVPixelFormat pix_fmt;
-+ int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
-+ AVCodec *hwcodec;
-+ AVCodec *codec;
-+ dxva2_context dxva2_ctx;
-+} DXVA2_DecoderContext;
-+
-+static const enum AVPixelFormat dxva2_pixfmts[] = {
-+ AV_PIX_FMT_YUV420P,
-+ AV_PIX_FMT_NONE
-+};
-+static int check_format(AVCodecContext *avctx);
-+
-+static void get_hw_soft_codec(struct AVCodecContext *avctx,DXVA2_DecoderContext *ctx)
-+{
-+ switch (avctx->codec_id) {
-+ #if CONFIG_H264_DXVA2_DECODER
-+ case AV_CODEC_ID_H264:
-+ ctx->hwcodec = &ff_h264_dxva2_decoder;
-+ ctx->codec = &ff_h264_decoder;
-+ return;
-+ #endif
-+ #if CONFIG_MPEG2VIDEO_DXVA2_DECODER
-+ case AV_CODEC_ID_MPEG2VIDEO:
-+ ctx->hwcodec = &ff_mpeg2video_dxva2_decoder;
-+ ctx->codec = &ff_mpeg2video_decoder;
-+ return;
-+ #endif
-+ #if CONFIG_VC1_DXVA2_DECODER
-+ case AV_CODEC_ID_VC1:
-+ ctx->hwcodec = &ff_vc1_dxva2_decoder;
-+ ctx->codec = &ff_vc1_decoder;
-+ return;
-+ #endif
-+ #if CONFIG_WMV3_DXVA2_DECODER
-+ case AV_CODEC_ID_WMV3:
-+ ctx->hwcodec = &ff_wmv3_dxva2_decoder;
-+ ctx->codec = &ff_wmv3_decoder;
-+ return;
-+ #endif
-+ }
-+}
-+
-+static int get_buffer2(struct AVCodecContext *avctx, AVFrame *pic, int flags)
-+{
-+ int ret;
-+ DXVA2_DecoderContext *ctx = (DXVA2_DecoderContext *)avctx->priv_data;
-+ dxva2_context *dxva2_ctx = &ctx->dxva2_ctx;
-+ avctx->pix_fmt = ctx->pix_fmt;
-+ ff_init_buffer_info(avctx, pic);
-+
-+ if ((ret = ctx->get_buffer2(avctx, pic, flags)) < 0) {
-+ return ret;
-+ }
-+ if (dxva2_ctx) {
-+ ff_get_dxva2_surface(dxva2_ctx, pic);
-+ return 0;
-+ } else {
-+ av_log(avctx, AV_LOG_ERROR, "No dxva2 context, get buffer failed\n");
-+ return AVERROR(EINVAL);
-+ }
-+}
-+
-+static enum PixelFormat get_format(AVCodecContext *p_context,
-+ const enum PixelFormat *pi_fmt)
-+{
-+ return AV_PIX_FMT_DXVA2_VLD;
-+}
-+
-+static int dxva2dec_decode(AVCodecContext *avctx, void *data, int *got_frame,
-+ AVPacket *avpkt)
-+{
-+ DXVA2_DecoderContext *ctx = (DXVA2_DecoderContext *)avctx->priv_data;
-+ AVFrame *pic = data;
-+ int ret;
-+ AVCodec *codec = ctx->codec;
-+ /* check if DXVA2 supports this file */
-+ if (check_format(avctx) < 0)
-+ return AVERROR(EINVAL);
-+ ret = codec->decode(avctx, data, got_frame, avpkt);
-+ if (*got_frame) {
-+ pic->format = ctx->pix_fmt;
-+ ff_extract_dxva2(&ctx->dxva2_ctx, pic);
-+ }
-+ avctx->pix_fmt = ctx->pix_fmt;
-+ return ret;
-+}
-+
-+static av_cold int dxva2dec_close(AVCodecContext *avctx)
-+{
-+ DXVA2_DecoderContext *ctx = avctx->priv_data;
-+ AVCodec *codec = ctx->codec;
-+ codec->flush(avctx);
-+ /* release buffers and decoder */
-+ ff_release_dxva2(&ctx->dxva2_ctx);
-+ /* close decoder */
-+ codec->close(avctx);
-+ return 0;
-+}
-+static int get_mpeg2_video_format(AVCodecContext *avctx)
-+{
-+ GetBitContext gb;
-+ const uint8_t *buf_ptr = avctx->extradata;
-+ const uint8_t *buf_end = avctx->extradata + avctx->extradata_size;
-+ int input_size, format = -1;
-+ if (avctx->extradata) {
-+ for (;;) {
-+ uint32_t start_code = UINT32_MAX;
-+ buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &start_code);
-+ input_size = buf_end - buf_ptr;
-+ if (input_size <= 0) {
-+ break;
-+ }
-+ if (EXT_START_CODE == start_code) {
-+ init_get_bits(&gb, buf_ptr, input_size * 8);
-+ switch (get_bits(&gb, 4)) {
-+ case 0x1:
-+ skip_bits(&gb, 9);
-+ format = get_bits(&gb, 2);
-+ return format;
-+ }
-+ }
-+ }
-+ }
-+ av_log(avctx, AV_LOG_ERROR,"get_mpeg2_video_format error\n");
-+ return format;
-+}
-+
-+static int check_format(AVCodecContext *avctx)
-+{
-+ uint8_t *pout;
-+ int psize, index, ret = -1;
-+ H264Context *h;
-+ AVCodecParserContext *parser = NULL;
-+ /* check if support */
-+ switch (avctx->codec_id) {
-+ case AV_CODEC_ID_H264:
-+ /* init parser & parse file */
-+ parser = av_parser_init(avctx->codec->id);
-+ if (!parser) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to open parser.\n");
-+ return ret;
-+ }
-+ parser->flags = PARSER_FLAG_COMPLETE_FRAMES;
-+ index = av_parser_parse2(parser, avctx, &pout, &psize, NULL, 0, 0, 0, 0);
-+ if (index < 0) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to parse this file.\n");
-+ av_parser_close(parser);
-+ return ret;
-+ }
-+ h = parser->priv_data;
-+ if (8 == h->sps.bit_depth_luma) {
-+ if (!CHROMA444(h) && !CHROMA422(h)) {
-+ // only this will decoder switch to hwaccel
-+ //check the profile
-+ if ((FF_PROFILE_H264_BASELINE == h->sps.profile_idc) ||
-+ (FF_PROFILE_H264_MAIN == h->sps.profile_idc) ||
-+ (FF_PROFILE_H264_HIGH == h->sps.profile_idc)) {
-+ ret = 0;
-+ }
-+ }
-+ }
-+ break;
-+ case AV_CODEC_ID_MPEG2VIDEO:
-+ if (CHROMA_420 == get_mpeg2_video_format(avctx)) {
-+ ret = 0;
-+ }
-+ break;
-+ default:
-+ ret = 0;
-+ break;
-+ }
-+ 
-+ if (0 > ret) {
-+ av_log(avctx, AV_LOG_ERROR, "Unsupported file.\n");
-+ }
-+ if (parser) {
-+ av_parser_close(parser);
-+ }
-+ return ret;
-+}
-+
-+static av_cold int dxva2dec_init(AVCodecContext *avctx)
-+{
-+ DXVA2_DecoderContext *ctx = (DXVA2_DecoderContext *)avctx->priv_data;
-+ dxva2_context *dxva2_ctx = (dxva2_context *)(&ctx->dxva2_ctx);
-+ AVCodec *hwcodec, *codec;
-+ int ret;
-+ get_hw_soft_codec(avctx,ctx);
-+ hwcodec = ctx->hwcodec;
-+ codec = ctx->codec;
-+ /* init pix_fmts of codec */
-+ if (!hwcodec->pix_fmts) {
-+ hwcodec->pix_fmts = dxva2_pixfmts;
-+ }
-+ /* check if DXVA2 supports this file */
-+ if (check_format(avctx) < 0)
-+ return AVERROR(EINVAL);
-+
-+ /* init vda */
-+ memset(dxva2_ctx, 0, sizeof(dxva2_context));
-+ ret = ff_create_dxva2(avctx->codec_id, dxva2_ctx);
-+ if (ret < 0) {
-+ av_log(avctx, AV_LOG_ERROR, "create dxva2 error\n");
-+ return AVERROR(EINVAL);
-+ }
-+ ctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts);
-+ ret = ff_setup_dxva2(dxva2_ctx, &avctx->hwaccel_context, &avctx->pix_fmt, avctx->width, avctx->height);
-+ if (ret < 0) {
-+ av_log(avctx,AV_LOG_ERROR,"error DXVA setup %d\n", ret);
-+ ret = AVERROR(EINVAL);
-+ goto failed;
-+ }
-+ avctx->slice_flags |= SLICE_FLAG_ALLOW_FIELD;
-+ /* changes callback functions */
-+ ctx->get_buffer2 = avctx->get_buffer2;
-+ avctx->get_format = get_format;
-+ avctx->get_buffer2 = get_buffer2;
-+ /* init decoder */
-+
-+ ret = codec->init(avctx);
-+ if (ret < 0) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to open decoder.\n");
-+ goto failed;
-+ }
-+ return 0;
-+failed:
-+ dxva2dec_close(avctx);
-+ return ret;
-+}
-+
-+static void dxva2dec_flush(AVCodecContext *avctx)
-+{
-+ DXVA2_DecoderContext *ctx = (DXVA2_DecoderContext *)avctx->priv_data;
-+ AVCodec *codec = ctx->codec;
-+ return codec->flush(avctx);
-+}
-+#if CONFIG_H264_DXVA2_DECODER
-+AVCodec ff_h264_dxva2_decoder = {
-+ .name = "h264_dxva2",
-+ .type = AVMEDIA_TYPE_VIDEO,
-+ .id = AV_CODEC_ID_H264,
-+ .priv_data_size = sizeof(DXVA2_DecoderContext),
-+ .init = dxva2dec_init,
-+ .close = dxva2dec_close,
-+ .decode = dxva2dec_decode,
-+ .capabilities = CODEC_CAP_DELAY,
-+ .flush = dxva2dec_flush,
-+ .long_name = NULL_IF_CONFIG_SMALL("H.264 (DXVA2 acceleration)"),
-+};
-+#endif
-+
-+#if CONFIG_MPEG2VIDEO_DXVA2_DECODER
-+AVCodec ff_mpeg2video_dxva2_decoder = {
-+ .name = "mpeg2video_dxva2",
-+ .type = AVMEDIA_TYPE_VIDEO,
-+ .id = AV_CODEC_ID_MPEG2VIDEO,
-+ .priv_data_size = sizeof(DXVA2_DecoderContext),
-+ .init = dxva2dec_init,
-+ .close = dxva2dec_close,
-+ .decode = dxva2dec_decode,
-+ .capabilities = CODEC_CAP_DELAY,
-+ .flush = dxva2dec_flush,
-+ .long_name = NULL_IF_CONFIG_SMALL("MPEG2 Video (DXVA2 acceleration)"),
-+};
-+#endif
-+
-+#if CONFIG_VC1_DXVA2_DECODER
-+AVCodec ff_vc1_dxva2_decoder = {
-+ .name = "vc1_dxva2",
-+ .type = AVMEDIA_TYPE_VIDEO,
-+ .id = AV_CODEC_ID_VC1,
-+ .priv_data_size = sizeof(DXVA2_DecoderContext),
-+ .init = dxva2dec_init,
-+ .close = dxva2dec_close,
-+ .decode = dxva2dec_decode,
-+ .capabilities = CODEC_CAP_DELAY,
-+ .flush = dxva2dec_flush,
-+ .long_name = NULL_IF_CONFIG_SMALL("VC1 (DXVA2 acceleration)"),
-+};
-+#endif
-+
-+#if CONFIG_WMV3_DXVA2_DECODER
-+AVCodec ff_wmv3_dxva2_decoder = {
-+ .name = "wmv3_dxva2",
-+ .type = AVMEDIA_TYPE_VIDEO,
-+ .id = AV_CODEC_ID_WMV3,
-+ .priv_data_size = sizeof(DXVA2_DecoderContext),
-+ .init = dxva2dec_init,
-+ .close = dxva2dec_close,
-+ .decode = dxva2dec_decode,
-+ .capabilities = CODEC_CAP_DELAY,
-+ .flush = dxva2dec_flush,
-+ .long_name = NULL_IF_CONFIG_SMALL("WMV3 (DXVA2 acceleration)"),
-+};
-+#endif
-diff --git a/libavcodec/dxva2_wrapper.c b/libavcodec/dxva2_wrapper.c
-new file mode 100644
-index 0000000..7fceb74
---- /dev/null
-+++ b/libavcodec/dxva2_wrapper.c
-@@ -0,0 +1,777 @@
-+/*
-+ * Call hardware decode acceleration through dxva2 API
-+ *
-+ * Copyright (C) 2009 Geoffroy Couprie
-+ * Copyright (C) 2009 Laurent Aimar
-+ * $Id: 0af77c6633657d4a700a3f60e5ff7c417086822f $
-+ *
-+ * Authors: Geoffroy Couprie <geal@videolan.org>
-+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
-+ * Modified by Wei Gao <weigao@multicorewareinc.com>
-+ *
-+ * Attribute from VLC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "dxva2_wrapper.h"
-+#include <dxgi.h>
-+
-+/* XXX Prefered format must come first */
-+static const d3d_format_t d3d_formats[] = {
-+ { "YV12", (D3DFORMAT)MAKEFOURCC('Y','V','1','2'), AV_PIX_FMT_YUV420P },
-+ { "NV12", (D3DFORMAT)MAKEFOURCC('N','V','1','2'), AV_PIX_FMT_NV12 },
-+ { NULL, (D3DFORMAT)0, PIX_FMT_NONE }
-+};
-+
-+static const GUID DXVA2_ModeMPEG2_MoComp = {
-+ 0xe6a9f44b, 0x61b0,0x4563, {0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66}
-+};
-+static const GUID DXVA2_ModeMPEG2_IDCT = {
-+ 0xbf22ad00, 0x03ea,0x4690, {0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e}
-+};
-+static const GUID DXVA2_ModeMPEG2_VLD = {
-+ 0xee27417f, 0x5e28,0x4e65, {0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9}
-+};
-+static const GUID DXVA2_ModeMPEG2and1_VLD = {
-+ 0x86695f12, 0x340e,0x4f04, {0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60}
-+};
-+static const GUID DXVA2_ModeMPEG1_VLD = {
-+ 0x6f3ec719, 0x3735,0x42cc, {0x80,0x63,0x65,0xcc,0x3c,0xb3,0x66,0x16}
-+};
-+
-+static const GUID DXVA2_ModeH264_A = {
-+ 0x1b81be64, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeH264_B = {
-+ 0x1b81be65, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeH264_C = {
-+ 0x1b81be66, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeH264_D = {
-+ 0x1b81be67, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeH264_E = {
-+ 0x1b81be68, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeH264_F = {
-+ 0x1b81be69, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA_ModeH264_VLD_WithFMOASO_NoFGT = {
-+ 0xd5f04ff9, 0x3418,0x45d8, {0x95,0x61,0x32,0xa7,0x6a,0xae,0x2d,0xdd}
-+};
-+static const GUID DXVADDI_Intel_ModeH264_A = {
-+ 0x604F8E64, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
-+};
-+static const GUID DXVADDI_Intel_ModeH264_C = {
-+ 0x604F8E66, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
-+};
-+static const GUID DXVADDI_Intel_ModeH264_E = { // DXVA_Intel_H264_ClearVideo
-+ 0x604F8E68, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
-+};
-+static const GUID DXVA2_ModeWMV8_A = {
-+ 0x1b81be80, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeWMV8_B = {
-+ 0x1b81be81, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeWMV9_A = {
-+ 0x1b81be90, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeWMV9_B = {
-+ 0x1b81be91, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeWMV9_C = {
-+ 0x1b81be94, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+
-+static const GUID DXVA2_ModeVC1_A = {
-+ 0x1b81beA0, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeVC1_B = {
-+ 0x1b81beA1, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeVC1_C = {
-+ 0x1b81beA2, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+static const GUID DXVA2_ModeVC1_D = {
-+ 0x1b81beA3, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+/* Conformity to the August 2010 update of the specification, ModeVC1_VLD2010 */
-+static const GUID DXVA2_ModeVC1_D2010 = {
-+ 0x1b81beA4, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+
-+static const GUID DXVA_NoEncrypt = {
-+ 0x1b81bed0, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
-+};
-+
-+static const GUID DXVA_Intel_VC1_ClearVideo = {
-+ 0xBCC5DB6D, 0xA2B6,0x4AF0, {0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89}
-+};
-+
-+static const GUID DXVA_nVidia_MPEG4_ASP = {
-+ 0x9947EC6F, 0x689B,0x11DC, {0xA3,0x20,0x00,0x19,0xDB,0xBC,0x41,0x84}
-+};
-+static const GUID DXVA_ModeMPEG4pt2_VLD_Simple = {
-+ 0xefd64d74, 0xc9e8,0x41d7, {0xa5,0xe9,0xe9,0xb0,0xe3,0x9f,0xa3,0x19}
-+};
-+static const GUID DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC = {
-+ 0xed418a9f, 0x10d,0x4eda, {0x9a,0xe3,0x9a,0x65,0x35,0x8d,0x8d,0x2e}
-+};
-+static const GUID DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC = {
-+ 0xab998b5b, 0x4258,0x44a9, {0x9f,0xeb,0x94,0xe5,0x97,0xa6,0xba,0xae}
-+};
-+
-+static const GUID IID_IDirectXVideoDecoderService = {
-+ 0xfc51a551, 0xd5e7, 0x11d9, {0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02}
-+};
-+static const GUID IID_IDirectXVideoAccelerationService = {
-+ 0xfc51a550, 0xd5e7, 0x11d9, {0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02}
-+};
-+
-+/* XXX Prefered modes must come first */
-+static const dxva2_mode_t dxva2_modes[] = {
-+ { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO },
-+ { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO },
-+ { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0 },
-+ { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 0 },
-+
-+ { "MPEG-1 variable-length decoder", &DXVA2_ModeMPEG1_VLD, 0 },
-+
-+ { "H.264 variable-length decoder, film grain technology", &DXVA2_ModeH264_F, AV_CODEC_ID_H264 },
-+ { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, AV_CODEC_ID_H264 },
-+ { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)",&DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 },
-+ { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, AV_CODEC_ID_H264 },
-+ { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 0 },
-+ { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 0 },
-+ { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 0 },
-+ { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 0 },
-+ { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 0 },
-+ { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 0 },
-+
-+ { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 0 },
-+ { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 0 },
-+
-+ { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0 },
-+ { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 0 },
-+ { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 },
-+
-+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1 },
-+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3 },
-+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_VC1 },
-+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_WMV3 },
-+ { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 0 },
-+ { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 0 },
-+ { "VC-1 post processing", &DXVA2_ModeVC1_A, 0 },
-+
-+ { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0 },
-+
-+ { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 0 },
-+ { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 0 },
-+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no global motion compensation", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0 },
-+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, global motion compensation", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0 },
-+
-+ { NULL, NULL, 0 }
-+};
-+
-+typedef struct DXVA2Log {
-+ const AVClass *class;
-+ int log_offset;
-+ void *log_ctx;
-+} DXVA2Log;
-+
-+static const AVClass dxva2wrapper_class = { "DXVA2WRAPPER", av_default_item_name, NULL,
-+ LIBAVUTIL_VERSION_INT, offsetof(DXVA2Log,
-+ log_offset), offsetof(DXVA2Log, log_ctx)};
-+static DXVA2Log dxva2wrapper = {&dxva2wrapper_class,0,NULL};
-+
-+static const d3d_format_t *d3d_find_format(D3DFORMAT format)
-+{
-+ for (unsigned i = 0; d3d_formats[i].name; i++) {
-+ if (d3d_formats[i].format == format)
-+ return &d3d_formats[i];
-+ }
-+ return NULL;
-+}
-+
-+static const dxva2_mode_t *dxva2_find_mode(const GUID *guid)
-+{
-+ for (unsigned i = 0; dxva2_modes[i].name; i++) {
-+ if (IsEqualGUID(dxva2_modes[i].guid, guid))
-+ return &dxva2_modes[i];
-+ }
-+ return NULL;
-+}
-+
-+/**
-+* It creates a Direct3D device usable for DXVA 2
-+*/
-+
-+static int d3d_create_device(dxva2_context *va)
-+{
-+ typedef LPDIRECT3D9 (WINAPI *Create9func)(UINT SDKVersion);
-+ typedef HWND (WINAPI *PROCGETSHELLWND)(void);
-+ Create9func dx_create9 = (Create9func )GetProcAddress(va->hd3d9_dll, TEXT("Direct3DCreate9"));
-+ LPDIRECT3D9 d3dobj;
-+ D3DADAPTER_IDENTIFIER9 *d3dai = &va->d3dai;
-+ PROCGETSHELLWND get_shell_window;
-+ HMODULE hUser32 = GetModuleHandle( "user32" );
-+ D3DPRESENT_PARAMETERS *d3dpp = &va->d3dpp;
-+ LPDIRECT3DDEVICE9 d3ddev;
-+ if (!dx_create9) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "Cannot locate reference to Direct3DCreate9 ABI in DLL");
-+ return AVERROR_EXTERNAL;
-+ }
-+ d3dobj = dx_create9(D3D_SDK_VERSION);
-+ if (!d3dobj) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "Direct3DCreate9 failed");
-+ return AVERROR_EXTERNAL;
-+ }
-+ va->d3dobj = d3dobj;
-+ if (FAILED(IDirect3D9_GetAdapterIdentifier(va->d3dobj,
-+ D3DADAPTER_DEFAULT, 0, d3dai))) {
-+ av_log(&dxva2wrapper, AV_LOG_WARNING, "IDirect3D9_GetAdapterIdentifier failed");
-+ ZeroMemory(d3dai, sizeof(*d3dai));
-+ }
-+ get_shell_window = (PROCGETSHELLWND)
-+ GetProcAddress( hUser32, "GetShellWindow" );
-+ ZeroMemory(d3dpp, sizeof(*d3dpp));
-+ d3dpp->Flags = D3DPRESENTFLAG_VIDEO;
-+ d3dpp->Windowed = TRUE;
-+ d3dpp->hDeviceWindow = NULL;
-+ d3dpp->SwapEffect = D3DSWAPEFFECT_DISCARD;
-+ d3dpp->MultiSampleType = D3DMULTISAMPLE_NONE;
-+ d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
-+ d3dpp->BackBufferCount = 0;
-+ d3dpp->BackBufferFormat = D3DFMT_X8R8G8B8;
-+ d3dpp->BackBufferWidth = 0;
-+ d3dpp->BackBufferHeight = 0;
-+ d3dpp->EnableAutoDepthStencil = FALSE;
-+ if (FAILED(IDirect3D9_CreateDevice(d3dobj, D3DADAPTER_DEFAULT,
-+ D3DDEVTYPE_HAL, get_shell_window(),
-+ D3DCREATE_SOFTWARE_VERTEXPROCESSING |
-+ D3DCREATE_MULTITHREADED,
-+ d3dpp, &d3ddev))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirect3D9_CreateDevice failed\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ va->d3ddev = d3ddev;
-+ return 0;
-+}
-+
-+/**
-+* It releases a Direct3D device and its resources.
-+*/
-+
-+static void d3d_destroy_device(dxva2_context *va)
-+{
-+ if (va->d3ddev)
-+ IDirect3DDevice9_Release(va->d3ddev);
-+ if (va->d3dobj)
-+ IDirect3D9_Release(va->d3dobj);
-+}
-+/**
-+* It destroys a Direct3D device manager
-+*/
-+static void d3d_destroy_device_manager(dxva2_context *va)
-+{
-+ if (va->devmng)
-+ IDirect3DDeviceManager9_Release( va->devmng );
-+}
-+
-+static void dx_destroy_video_service(dxva2_context *va)
-+{
-+ if (va->device)
-+ IDirect3DDeviceManager9_CloseDeviceHandle(va->devmng, va->device);
-+
-+ if (va->vs)
-+ IDirectXVideoDecoderService_Release(va->vs);
-+}
-+
-+static void dx_destroy_video_decoder(dxva2_context *va)
-+{
-+ unsigned int i;
-+ if (va->decoder)
-+ IDirectXVideoDecoder_Release(va->decoder);
-+ va->decoder = NULL;
-+ for (i = 0; i< va->surface_count; i++)
-+ IDirect3DSurface9_Release(va->surface[i].d3d);
-+ va->surface_count = 0;
-+}
-+
-+static void close(dxva2_context *external)
-+{
-+ dxva2_context *va = external;
-+
-+ dx_destroy_video_decoder(va);
-+ dx_destroy_video_service(va);
-+ d3d_destroy_device_manager(va);
-+ d3d_destroy_device(va);
-+
-+ if (va->hdxva2_dll)
-+ FreeLibrary(va->hdxva2_dll);
-+ if (va->hd3d9_dll)
-+ FreeLibrary(va->hd3d9_dll);
-+}
-+
-+/**
-+* Find the best suited decoder mode GUID and render format.
-+*/
-+
-+static int dx_find_video_service_conversion(dxva2_context *va, GUID *input,
-+ D3DFORMAT *output)
-+{
-+ /* Retrieve supported modes from the decoder service */
-+ unsigned int output_count, input_count = 0;
-+ GUID *input_list = NULL;
-+ int is_suported, i, j, k, count;
-+ D3DFORMAT *output_list;
-+ if (FAILED(IDirectXVideoDecoderService_GetDecoderDeviceGuids( va->vs, &input_count, &input_list ))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirectXVideoDecoderService_GetDecoderDeviceGuids failed\n");
-+ return -1;
-+ }
-+ for (i = 0; i < input_count; i++) {
-+ const GUID *g = &input_list[i];
-+ const dxva2_mode_t *mode = dxva2_find_mode(g);
-+ if (mode) {
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "- '%s' is supported by hardware\n", mode->name);
-+ } else {
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "- Unknown GUID = %08X-%04x-%04x-XXXX\n",
-+ (unsigned)g->Data1, g->Data2, g->Data3);
-+ }
-+ }
-+ /* Try all supported mode by our priority */
-+ for (i = 0; dxva2_modes[i].name; i++) {
-+ const dxva2_mode_t *mode = &dxva2_modes[i];
-+ if (!mode->codec || mode->codec != va->codec_id)
-+ continue;
-+
-+ /* */
-+ is_suported = FALSE;
-+ for (count = 0; !is_suported && count < input_count; count++) {
-+ const GUID *g = &input_list[count];
-+ is_suported = IsEqualGUID(mode->guid, g) == 0;
-+ }
-+ if (!is_suported)
-+ continue;
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "Trying to use '%s' as input\n", mode->name);
-+ output_count = 0;
-+ output_list = NULL;
-+ if (FAILED(IDirectXVideoDecoderService_GetDecoderRenderTargets(va->vs, mode->guid, &output_count, &output_list))) {
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "IDirectXVideoDecoderService_GetDecoderRenderTargets failed,try others\n");
-+ continue;
-+ }
-+ for (j = 0; j < output_count; j++) {
-+ const D3DFORMAT f = output_list[j];
-+ const d3d_format_t *format = d3d_find_format(f);
-+ if (format) {
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "%s is supported for output\n", format->name);
-+ } else {
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "%d is supported for output (%4.4s)\n", f, (const char*)&f);
-+ }
-+ }
-+
-+ /* */
-+ for (j = 0; d3d_formats[j].name; j++){
-+ const d3d_format_t *format = &d3d_formats[j];
-+ is_suported = FALSE;
-+ for (k = 0; !is_suported && k < output_count; k++) {
-+ is_suported = format->format == output_list[k];
-+ }
-+ if (!is_suported)
-+ continue;
-+
-+ /* We have our solution */
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "Using '%s' to decode to '%s'\n", mode->name, format->name);
-+ *input = *mode->guid;
-+ *output = format->format;
-+ return 0;
-+ }
-+ }
-+ return AVERROR_EXTERNAL;
-+}
-+
-+/**
-+* It creates a DirectX video service
-+*/
-+
-+static int dx_create_video_service(dxva2_context *va)
-+{
-+ typedef HRESULT (WINAPI *CreateVideoService_func)(IDirect3DDevice9 *,
-+ REFIID riid,
-+ void **ppService);
-+ CreateVideoService_func create_video_service =
-+ (CreateVideoService_func)GetProcAddress(va->hdxva2_dll,
-+ TEXT("DXVA2CreateVideoService"));
-+
-+ HRESULT hr;
-+ HANDLE device;
-+ IDirectXVideoDecoderService *vs;
-+
-+ if (!create_video_service) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "cannot load function\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "DXVA2CreateVideoService Success!\n");
-+ hr = IDirect3DDeviceManager9_OpenDeviceHandle(va->devmng, &device);
-+ if (FAILED(hr)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "OpenDeviceHandle failed\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ va->device = device;
-+ hr = IDirect3DDeviceManager9_GetVideoService(va->devmng, device, &IID_IDirectXVideoDecoderService, (void **)(&vs));
-+ if (FAILED(hr)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "GetVideoService failed\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ va->vs = vs;
-+ return 0;
-+}
-+
-+/**
-+* It creates a Direct3D device manager
-+*/
-+
-+static int d3d_create_device_manager(dxva2_context *va)
-+{
-+ typedef HRESULT (WINAPI *CreateDeviceManager9_func)(UINT *pResetToken, IDirect3DDeviceManager9 **);
-+ CreateDeviceManager9_func create_device_manager9 =
-+ (CreateDeviceManager9_func)GetProcAddress(va->hdxva2_dll, TEXT("DXVA2CreateDirect3DDeviceManager9"));
-+ UINT token;
-+ HRESULT hr;
-+ IDirect3DDeviceManager9 *devmng;
-+ if (!create_device_manager9) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "cannot load function\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "OurDirect3DCreateDeviceManager9 Success!\n");
-+ if (FAILED(create_device_manager9(&token, &devmng))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, " OurDirect3DCreateDeviceManager9 failed\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+
-+ hr = IDirect3DDeviceManager9_ResetDevice(devmng, va->d3ddev, token);
-+ if (FAILED(hr)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirect3DDeviceManager9_ResetDevice failed: %08x", (unsigned)hr);
-+ return AVERROR_EXTERNAL;
-+ }
-+
-+ IDirect3DDeviceManager9_AddRef(devmng);
-+ va->token = token;
-+ va->devmng = devmng;
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "obtained IDirect3DDeviceManager9\n");
-+ return 0;
-+}
-+
-+int ff_create_dxva2(int codec_id, dxva2_context *dxva2_ctx)
-+{
-+ if (!dxva2_ctx)
-+ return -1;
-+
-+ dxva2_ctx->codec_id = codec_id;
-+ /* Load dll*/
-+ dxva2_ctx->hd3d9_dll = LoadLibrary(TEXT("D3D9.DLL"));
-+ if (!dxva2_ctx->hd3d9_dll) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "cannot load d3d9.dll\n");
-+ goto error;
-+ }
-+ dxva2_ctx->hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL"));
-+ if (!dxva2_ctx->hdxva2_dll) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "cannot load dxva2.dll\n");
-+ goto error;
-+ }
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "DLLs loaded\n");
-+
-+ /* */
-+ if (d3d_create_device(dxva2_ctx)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "Failed to create Direct3D device\n");
-+ goto error;
-+ }
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "d3d_create_device succeed\n");
-+
-+ if (d3d_create_device_manager(dxva2_ctx)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "d3d_create_device_manager failed\n");
-+ goto error;
-+ }
-+
-+ if (dx_create_video_service(dxva2_ctx)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "dx_create_video_service failed\n");
-+ goto error;
-+ }
-+
-+ /* */
-+ if (dx_find_video_service_conversion(dxva2_ctx, &dxva2_ctx->input, &dxva2_ctx->render)) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "dx_find_video_service_conversion failed\n");
-+ goto error;
-+ }
-+ return 0;
-+ /* TODO print the hardware name/vendor for debugging purposes */
-+error:
-+ close(dxva2_ctx);
-+ return AVERROR_EXTERNAL;
-+}
-+
-+/**
-+* It creates a DXVA2 decoder using the given video format
-+*/
-+
-+static int dx_create_video_decoder(dxva2_context *va, int codec_id,
-+ const struct video_format_t *fmt)
-+{
-+ LPDIRECT3DSURFACE9 surface_list[VA_DXVA2_MAX_SURFACE_COUNT];
-+ DXVA2_VideoDesc dsc;
-+ DXVA2_ExtendedFormat *ext;
-+ UINT cfg_count = 0;
-+ DXVA2_ConfigPictureDecode *cfg_list = NULL;
-+ IDirectXVideoDecoder *decoder;
-+ int cfg_score, score, i;
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "dx_create_video_decoder id %d %dx%d\n",
-+ codec_id, fmt->i_width, fmt->i_height);
-+
-+ va->width = fmt->i_width;
-+ va->height = fmt->i_height;
-+
-+ /* Allocates all surfaces needed for the decoder */
-+
-+ va->surface_width = (fmt->i_width + 255) & ~255;
-+ va->surface_height = (fmt->i_height + 255) & ~255;
-+
-+ switch (codec_id) {
-+ case AV_CODEC_ID_H264:
-+ va->surface_count = 16 + 1;
-+ break;
-+ default:
-+ va->surface_count = 4 + 1;
-+ break;
-+ }
-+ if (FAILED(IDirectXVideoDecoderService_CreateSurface(va->vs,
-+ va->surface_width,
-+ va->surface_height,
-+ va->surface_count - 1,
-+ va->render,
-+ D3DPOOL_DEFAULT,
-+ 0,
-+ DXVA2_VideoDecoderRenderTarget,
-+ surface_list, NULL ))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirectXVideoAccelerationService_CreateSurface failed\n");
-+ va->surface_count = 0;
-+ return AVERROR_EXTERNAL;
-+ }
-+ for (i = 0; i < va->surface_count; i++) {
-+ ff_va_surface_t *surface = &va->surface[i];
-+ surface->d3d = surface_list[i];
-+ surface->refcount = 0;
-+ surface->order = 0;
-+ }
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "IDirectXVideoAccelerationService_CreateSurface succeed with %d surfaces (%dx%d)\n",
-+ va->surface_count, fmt->i_width, fmt->i_height);
-+ ZeroMemory(&dsc, sizeof(dsc));
-+ dsc.SampleWidth = fmt->i_width;
-+ dsc.SampleHeight = fmt->i_height;
-+ dsc.Format = va->render;
-+ if (fmt->i_frame_rate > 0 && fmt->i_frame_rate_base > 0) {
-+ dsc.InputSampleFreq.Numerator = fmt->i_frame_rate;
-+ dsc.InputSampleFreq.Denominator = fmt->i_frame_rate_base;
-+ } else {
-+ dsc.InputSampleFreq.Numerator = 0;
-+ dsc.InputSampleFreq.Denominator = 0;
-+ }
-+ dsc.OutputFrameFreq = dsc.InputSampleFreq;
-+ dsc.UABProtectionLevel = FALSE;
-+ dsc.Reserved = 0;
-+
-+ ext = &dsc.SampleFormat;
-+ ext->SampleFormat = 0;//DXVA2_SampleUnknown;
-+ ext->VideoChromaSubsampling = 0;//DXVA2_VideoChromaSubsampling_Unknown;
-+ ext->NominalRange = 0;//DXVA2_NominalRange_Unknown;
-+ ext->VideoTransferMatrix = 0;//DXVA2_VideoTransferMatrix_Unknown;
-+ ext->VideoLighting = 0;//DXVA2_VideoLighting_Unknown;
-+ ext->VideoPrimaries = 0;//DXVA2_VideoPrimaries_Unknown;
-+ ext->VideoTransferFunction = 0;//DXVA2_VideoTransFunc_Unknown;
-+
-+ /* List all configurations available for the decoder */
-+
-+ if (FAILED(IDirectXVideoDecoderService_GetDecoderConfigurations( va->vs, &va->input, &dsc, NULL, &cfg_count, &cfg_list ))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirectXVideoDecoderService_GetDecoderConfigurations failed\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "we got %d decoder configurations\n", cfg_count);
-+
-+ /* Select the best decoder configuration */
-+ cfg_score = 0;
-+ for (i = 0; i < cfg_count; i++) {
-+ const DXVA2_ConfigPictureDecode *cfg = &cfg_list[i];
-+
-+ /* */
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "configuration[%d] ConfigBitstreamRaw %d\n",
-+ i, cfg->ConfigBitstreamRaw);
-+ if (cfg->ConfigBitstreamRaw == 1)
-+ score = 1;
-+ else if (codec_id == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2)
-+ score = 2;
-+ else
-+ continue;
-+ if (IsEqualGUID(&cfg->guidConfigBitstreamEncryption, &DXVA_NoEncrypt))
-+ score += 16;
-+ if (cfg_score < score) {
-+ va->cfg = *cfg;
-+ cfg_score = score;
-+ }
-+ }
-+ if (cfg_score <= 0) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "Failed to find a supported decoder configuration\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ if (FAILED(IDirectXVideoDecoderService_CreateVideoDecoder(va->vs, &va->input, &dsc, &va->cfg, surface_list, va->surface_count, &decoder))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirectXVideoDecoderService_CreateVideoDecoder failed\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ va->decoder = decoder;
-+ av_log(&dxva2wrapper, AV_LOG_VERBOSE, "IDirectXVideoDecoderService_CreateVideoDecoder succeed\n");
-+ return 0;
-+}
-+
-+static void dx_create_video_conversion(dxva2_context *va)
-+{
-+ switch (va->render) {
-+ case MAKEFOURCC('N','V','1','2'):
-+ va->output = (D3DFORMAT)MAKEFOURCC('Y','V','1','2');
-+ break;
-+ default:
-+ va->output = va->render;
-+ break;
-+ }
-+}
-+
-+int ff_setup_dxva2(dxva2_context *dxva2_ctx, void **hw,
-+ enum PixelFormat *chroma, int width, int height)
-+{
-+ struct video_format_t fmt;
-+ const d3d_format_t *output;
-+ int i, ret = 0;
-+ if (dxva2_ctx->width == width && dxva2_ctx->height == height && dxva2_ctx->decoder)
-+ goto ok;
-+ dx_destroy_video_service(dxva2_ctx);
-+ *chroma = AV_PIX_FMT_NONE;
-+ if (width <= 0 || height <= 0)
-+ return AVERROR(EINVAL);
-+ memset(&fmt, 0, sizeof(fmt));
-+ fmt.i_width = width;
-+ fmt.i_height = height;
-+ ret = dx_create_video_decoder(dxva2_ctx, dxva2_ctx->codec_id, &fmt);
-+ if (ret < 0)
-+ return ret;
-+
-+ dxva2_ctx->hw.decoder = dxva2_ctx->decoder;
-+ dxva2_ctx->hw.cfg = &dxva2_ctx->cfg;
-+ dxva2_ctx->hw.surface_count = dxva2_ctx->surface_count;
-+ dxva2_ctx->hw.surface = dxva2_ctx->hw_surface;
-+ for (i = 0; i < dxva2_ctx->surface_count; i++)
-+ dxva2_ctx->hw.surface[i] = dxva2_ctx->surface[i].d3d;
-+ dx_create_video_conversion(dxva2_ctx);
-+ok:
-+ *hw = &dxva2_ctx->hw;
-+ output = d3d_find_format(dxva2_ctx->output);
-+ *chroma = output->codec;
-+ return 0;
-+}
-+
-+void ff_get_dxva2_surface(dxva2_context *external, AVFrame *ff)
-+{
-+ dxva2_context *va = external;
-+ unsigned int i, old;
-+ ff_va_surface_t *surface;
-+ for (i = 0, old = 0; i < va->surface_count; i++) {
-+ ff_va_surface_t *surface = &va->surface[i];
-+ if (!surface->refcount)
-+ break;
-+ if (surface->order < va->surface[old].order)
-+ old = i;
-+ }
-+ if (i >= va->surface_count)
-+ i = old;
-+ surface = &va->surface[i];
-+ surface->refcount = 1;
-+ surface->order = va->surface_order++;
-+ ff->data[3] = (uint8_t *)surface->d3d;
-+ return;
-+}
-+
-+void ff_release_dxva2_surface(dxva2_context *external, AVFrame *ff)
-+{
-+ dxva2_context *va = external;
-+ LPDIRECT3DSURFACE9 d3d = (LPDIRECT3DSURFACE9)(uintptr_t)ff->data[3];
-+ if (NULL == d3d)
-+ return;
-+ for (unsigned i = 0; i < va->surface_count; i++) {
-+ if (va->surface[i].d3d == d3d)
-+ va->surface[i].refcount--;
-+ }
-+}
-+
-+static void ff_copy_from_nv12(uint8_t *src[2], size_t src_pitch[2],
-+ unsigned width, unsigned height, AVFrame *ff )
-+{
-+ unsigned int i, j;
-+ uint8_t *dst_u, *dst_v;
-+ unsigned int heitht_uv, width_uv;
-+ dst_u = ff->data[1];
-+ dst_v = ff->data[2];
-+ heitht_uv = height/2;
-+ width_uv = width/2;
-+ for (i = 0; i < height; i++) {
-+ memcpy( ff->data[0] + i * ff->linesize[0], src[0]+i*src_pitch[0], width );
-+ }
-+ for (i = 0; i < heitht_uv; i++) {
-+ for (j = 0; j<width_uv; j++) {
-+ dst_u[i*ff->linesize[1]+j] = *(src[1]+i*src_pitch[1]+2*j);
-+ dst_v[i*ff->linesize[2]+j] = *(src[1]+i*src_pitch[1]+2*j+1);
-+ }
-+ }
-+}
-+
-+int ff_extract_dxva2(dxva2_context *dxva2,AVFrame *frame)
-+{
-+ LPDIRECT3DSURFACE9 d3d;
-+ D3DLOCKED_RECT lock;
-+ d3d = (LPDIRECT3DSURFACE9)(uintptr_t)frame->data[3];
-+ if (FAILED(IDirect3DSurface9_LockRect(d3d, &lock, NULL,D3DLOCK_READONLY))) {
-+ av_log(&dxva2wrapper, AV_LOG_ERROR, "IDirect3DSurface9_LockRect Error\n");
-+ return AVERROR_EXTERNAL;
-+ }
-+ if (dxva2->render == MAKEFOURCC( 'N', 'V', '1', '2' )) {
-+ uint8_t *plane[2] = {
-+ (uint8_t *)lock.pBits,
-+ (uint8_t *)lock.pBits + lock.Pitch * dxva2->surface_height
-+ };
-+ size_t pitch[2] = {
-+ lock.Pitch,
-+ lock.Pitch,
-+ };
-+ ff_copy_from_nv12(plane, pitch, dxva2->width, dxva2->height, frame);
-+ }
-+ IDirect3DSurface9_UnlockRect( d3d );
-+ return 0;
-+}
-+
-+void ff_release_dxva2(dxva2_context *dxva2_ctx)
-+{
-+ if (dxva2_ctx)
-+ close(dxva2_ctx);
-+}
-diff --git a/libavcodec/dxva2_wrapper.h b/libavcodec/dxva2_wrapper.h
-new file mode 100644
-index 0000000..96560bf
---- /dev/null
-+++ b/libavcodec/dxva2_wrapper.h
-@@ -0,0 +1,389 @@
-+/*
-+ * Call hardware decode acceleration through dxva2 API
-+
-+ * Copyright (C) 2009 Geoffroy Couprie
-+ * Copyright (C) 2009 Laurent Aimar
-+ * $Id: 0af77c6633657d4a700a3f60e5ff7c417086822f $
-+ *
-+ * Authors: Geoffroy Couprie <geal@videolan.org>
-+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
-+ * Modified by Wei Gao <weigao@multicorewareinc.com>
-+ *
-+ * Attribute from VLC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef DXVA2_WRAPPER_H
-+#define DXVA2_WRAPPER_H
-+
-+#define COBJMACROS
-+#pragma once
-+
-+#include <windows.h>
-+#include <d3d9.h>
-+#include "avcodec.h"
-+#include "dxva2.h"
-+
-+#ifndef false
-+#define false FALSE
-+#endif
-+
-+#define VA_DXVA2_MAX_SURFACE_COUNT (64)
-+typedef struct {
-+ /**
-+ * D3D surface, used for decode.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ LPDIRECT3DSURFACE9 d3d;
-+
-+ /**
-+ * D3D surface reference, if it is 1 means that the surface is being used.0 means the surface is free.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int refcount;
-+
-+ /**
-+ * D3D surface order.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int order;
-+} ff_va_surface_t;
-+
-+typedef struct{
-+ /**
-+ * Codec ID of Video.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int codec_id;
-+
-+ /**
-+ * Video width.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int width;
-+
-+ /**
-+ * Video height.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int height;
-+
-+ /**
-+ * Video D3D9 DLL handle.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ HINSTANCE hd3d9_dll;
-+
-+ /**
-+ * Video DXVA2 DLL handle.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ HINSTANCE hdxva2_dll;
-+
-+ /**
-+ * IDirect3D9 pointer.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ LPDIRECT3D9 d3dobj;
-+
-+ /**
-+ * IDirect3D9 pointer.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ LPDIRECT3DDEVICE9 d3ddev;
-+
-+ /**
-+ * IDirect3D9 present parameters.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ D3DPRESENT_PARAMETERS d3dpp;
-+
-+ /**
-+ * IDirect3D9 adapter identifier.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ D3DADAPTER_IDENTIFIER9 d3dai;
-+
-+ /**
-+ * D3D reset token,use it to reset device.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ UINT token;
-+
-+ /**
-+ * A pointer to the IDirect3DDeviceManager9 interface.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ IDirect3DDeviceManager9 *devmng;
-+
-+ /**
-+ * A handle to a Direct3D device.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ HANDLE device;
-+
-+ /**
-+ * A pointer to the requested interface.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ IDirectXVideoDecoderService *vs;
-+
-+ /**
-+ * The GUID of dxva2_modes.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ GUID input;
-+
-+ /**
-+ * The color format of D3D.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ D3DFORMAT render;
-+
-+ /**
-+ * The describes the configuration of a DXVA decoder device.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ DXVA2_ConfigPictureDecode cfg;
-+
-+ /**
-+ * The DXVA2 decoder object.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ IDirectXVideoDecoder *decoder;
-+
-+ /**
-+ * The color format of D3D.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ D3DFORMAT output;
-+
-+ /**
-+ * DXVA2 hwaccel context.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ struct dxva_context hw;
-+
-+ /**
-+ * DXVA2 decode surfaces number.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int surface_count;
-+
-+ /**
-+ * DXVA2 decode surfaces order, used for get surface.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int surface_order;
-+
-+ /**
-+ * DXVA2 width of decode surfaces.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int surface_width;
-+
-+ /**
-+ * DXVA2 heigt of decode surfaces.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int surface_height;
-+
-+ /**
-+ * Decode Surfaces used for decode.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ ff_va_surface_t surface[VA_DXVA2_MAX_SURFACE_COUNT];
-+
-+ /**
-+ * Decode Surfaces used for decode.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ LPDIRECT3DSURFACE9 hw_surface[VA_DXVA2_MAX_SURFACE_COUNT];
-+} dxva2_context;
-+
-+typedef struct {
-+ /**
-+ * The d3d format name.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ const char *name;
-+
-+ /**
-+ * The color format of D3D.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ D3DFORMAT format;
-+
-+ /**
-+ * The codec pixel format.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ enum PixelFormat codec;
-+} d3d_format_t;
-+
-+/**
-+ * video format description
-+ */
-+struct video_format_t
-+{
-+ /**
-+ * picture chroma.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ enum PixelFormat i_chroma;
-+
-+ /**
-+ * picture width.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int i_width;
-+
-+ /**
-+ * picture height.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int i_height;
-+ /**
-+ * frame rate numerator.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int i_frame_rate;
-+
-+ /**
-+ * frame rate denominator.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ unsigned int i_frame_rate_base;
-+};
-+
-+typedef struct {
-+ /**
-+ * DXVA2 decode mode name.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ const char *name;
-+
-+ /**
-+ * The GUID of dxva2_modes.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ const GUID *guid;
-+ /**
-+ * The codec id of ffmpeg.
-+ *
-+ * encoding: unused
-+ * decoding: Set by user.
-+ */
-+ int codec;
-+} dxva2_mode_t;
-+
-+/** Create the DXVA2 Object. */
-+int ff_create_dxva2(int codec_id,dxva2_context *dxva2_ctx);
-+
-+/** Initial DXVA2 Object. */
-+int ff_setup_dxva2(dxva2_context *external, void **hw, enum PixelFormat *chroma,int width, int height);
-+
-+/** Convert NV12 video to yuv video and save it into AVFrame*/
-+int ff_extract_dxva2( dxva2_context *dxva2,AVFrame *frame);
-+
-+/** Release DXVA2 object*/
-+void ff_release_dxva2(dxva2_context *dxva2_ctx);
-+
-+/** Get DXVA2 decode surface*/
-+void ff_get_dxva2_surface(dxva2_context *external, AVFrame *ff);
-+
-+/** Release DXVA2 decode surface*/
-+void ff_release_dxva2_surface(dxva2_context *external, AVFrame *ff);
-+
-+#endif/* AVCODEC_DXVA2_WRAPPER_H */
-diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
-index b4ebd23..91ece2c 100644
---- a/libavcodec/mpeg12.h
-+++ b/libavcodec/mpeg12.h
-@@ -24,6 +24,8 @@
- 
- #include "mpegvideo.h"
- 
-+#include "libavutil/stereo3d.h"
-+
- #define DC_VLC_BITS 9
- #define MV_VLC_BITS 9
- #define TEX_VLC_BITS 9
-@@ -43,6 +45,27 @@ extern VLC ff_mv_vlc;
- 
- extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
- 
-+typedef struct Mpeg1Context {
-+ MpegEncContext mpeg_enc_ctx;
-+ int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
-+ int repeat_field; /* true if we must repeat the field */
-+ AVPanScan pan_scan; /* some temporary storage for the panscan */
-+ AVStereo3D stereo3d;
-+ int has_stereo3d;
-+ uint8_t *a53_caption;
-+ int a53_caption_size;
-+ uint8_t afd;
-+ int has_afd;
-+ int slice_count;
-+ int save_aspect_info;
-+ int save_width, save_height, save_progressive_seq;
-+ AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */
-+ int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
-+ int tmpgexs;
-+ int first_slice;
-+ int extradata_decoded;
-+} Mpeg1Context;
-+
- void ff_mpeg12_common_init(MpegEncContext *s);
- void ff_mpeg12_init_vlcs(void);
- 
-diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
-index 78888c7..ef9a971 100644
---- a/libavcodec/mpeg12dec.c
-+++ b/libavcodec/mpeg12dec.c
-@@ -47,26 +47,6 @@
- #include "vdpau_internal.h"
- #include "xvmc_internal.h"
- 
--typedef struct Mpeg1Context {
-- MpegEncContext mpeg_enc_ctx;
-- int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
-- int repeat_field; /* true if we must repeat the field */
-- AVPanScan pan_scan; /* some temporary storage for the panscan */
-- AVStereo3D stereo3d;
-- int has_stereo3d;
-- uint8_t *a53_caption;
-- int a53_caption_size;
-- uint8_t afd;
-- int has_afd;
-- int slice_count;
-- int save_aspect_info;
-- int save_width, save_height, save_progressive_seq;
-- AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */
-- int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
-- int tmpgexs;
-- int first_slice;
-- int extradata_decoded;
--} Mpeg1Context;
- 
- #define MB_TYPE_ZERO_MV 0x20000000
- 
--- 
-1.8.1.2
-

sview-15_10.tar.gz/LICENSE Deleted

@@ -1,61 +0,0 @@
-StShared,
-StGLWidget:
------------
-
-sources of these libraries are under Boost license. Read the file "license-boost.txt" for details.
-Notice that some sources are wrappers over other 3rd-parties
-and their licenses should be taken into account when used.
-
-StCore,
-StOutAnaglyph,
-StOutDual,
-StOutInterlace,
-StOutIZ3D,
-StOutPageFlip:
---------------
-
-these libraries are under the GNU Lesser General Public License version 3.0 or later.
-Read the file "license-lgpl-3.0.txt" for details.
-
-StImageViewer,
-StMoviePlayer,
-StDiagnostics,
-StMonitorsDump,
-StBrowserPlugin,
-StTests:
---------
-
-these libraries and programs are under the GNU General Public License version 3.0 or later.
-Read the file "license-gpl-3.0.txt" for details.
-
-sView:
-------
-
-sView executable project is a dummy entry point to real applications like StImageViewer.
-Formally it was licensed under Boost license terms.
-
-StCADViewer:
-------------
-
-this program is under the GNU General Public License version 3.0 or later.
-
-External libraries:
--------------------
-
-FFmpeg libraries are distributed under GNU Lesser General Public License version 2.1 or later.
-http://ffmpeg.org/
-
-libconfig++ library distributed under GNU Lesser General Public License version 2.1 or later.
-http://www.hyperrealm.com/libconfig/
-
-OpenAL library distributed under GNU Lesser General Public License version 2.1 or later.
-http://kcat.strangesoft.net/openal.html
-
-FreeType library distributed under FreeType License (BSD-style license with a credit clause).
-http://www.freetype.org/
-
-Open CASCADE Technology libraries distributed under GNU Lesser General Public License version 2.1.
-http://dev.opencascade.org/
-
-Some 3rd-parties may depend on other libraries and provide more license options.
-Please read license information for original projects.

sview-15_10.tar.gz/README Deleted

sview-15_10.tar.gz/docs/INSTALL Deleted

@@ -1,113 +0,0 @@
-I. Installing 3rd-parties
-=========================
-
-sView requires several 3rd-party components for building:
-- C/C++ compiler (g++, MSVC 2010+)
-- Code::Blocks (http://www.codeblocks.org)
-- FFmpeg (http://www.ffmpeg.org)
-- OpenAL soft (http://kcat.strangesoft.net/openal.html)
-- libwebp, optional (https://developers.google.com/speed/webp/download)
-- GTK2+, Linux only (http://www.gtk.org)
-- libconfig++, Linux and Android (http://www.hyperrealm.com/libconfig)
-- libxpm, Linux only
-
-On Debian/Ubuntu you might use the following command to install all dependencies at once:
-
-sudo apt-get install \
- g++ \
- libgtk2.0-dev \
- libopenal-dev \
- libgl1-mesa-dev \
- libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev \
- libwebp-dev \
- libconfig++-dev libconfig-dev \
- libxpm-dev \
- codeblocks
-
-The similar command for RPM-based distributives:
-
-yum install gcc gcc-c++ \
- gtk+-devel gtk2-devel \
- mesa-libGLU-devel glew-devel \
- openal-devel \
- libconfig-devel
-
-rpm -Uvh http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm
-yum install ffmpeg-devel
-
-On Windows and Mac OS X please refer to official documentation for each project.
-Notice that DevIL and FreeImage libraries are optional and need not for building sView
-(libraries are loaded dynamically if available).
-
-II. Makefile on Linux
-=====================
-
-Current Makefile has been written only for DEB/RPM source packages
-and lacks configuration flexibility (means ther NO any ./configure and so on).
-
-All you need is to install dependencies and to execute traditional commands:
-
-  make && make install
-
-III. Code::Blocks
-=================
-
-Code::Blocks is an official way for building and development of sView.
-There are several building targets depending on platform
-(Mac OS X, Linux, Windows) and debugging possibilities:
-- WIN_vc_x86,        32-bit target using Visual Studio compiler
-- WIN_vc_x86_DEBUG,  32-bit target with debugging options
-- WIN_vc_AMD64,      64-bit target using Visual Studio compiler
-- LINUX_gcc,         Linux target, g++ compiler
-- LINUX_gcc_DEBUG,   Linux target with debugging options
-- MAC_gcc,           Mac OS X target, g++ compatible compiler
-- MAC_gcc_DEBUG,     Mac OS X target with debugging options
-
-Notice that the following compilers should be configured within Code::Blocks:
-- gcc,               configured to g++ or compatible compiler (on systems other than Windows)
-- msvc10,            configured to Visual Studio 2010+ compiler, PSDK and DXSDK
-- windows_sdk_x86_64 (copy of msvc10) configured to 64-bit libraries and compiler toolchain
-
-3rd-parties should be either configured as Code::Blocks global compiler options
-or placed into "3rdparty" folder.
-
-IV. Building options
-====================
-
-Several preprocessor directives control building options.
-Notice that by default "include/stconfig.conf" file is used to override these options
-(this file will be used only when ST_HAVE_STCONFIG is defined).
-
-- ST_HAVE_WEBP - should be defined to activate libwebp usage
-  (notice that since next releases of FFmpeg might have built-in support for webp/webpll image files)
-- ST_HAVE_MONGOOSE - should be defined to activate built-in web UI for remote Movie Player control
-- ST_HAVE_OCCT - should be defined to activate CAD files import in tiny CAD viewer
-- ST_DEBUG - should be defined to activate debugging log output
-- ST_DEBUG_LOG_TO_FILE - specifies file name or full path to duplicate debug log output
-
-V. Distribution scripts
-=======================
-
-Several script were written to automate distribution routines.
-All them were placed in "distribution" folder.
-
-- build.bat, batch script for Windows. Performs re-building of WIN_vc_x86 and WIN_vc_AMD64 targets
-  using Code::Blocks and pack result binaries using InnoSetup script.
-  Notice that all dependencies should be available (including InnoSetup),
-  and DLLs should be placed into bin/WIN_vc_x86 and bin/WIN_vc_AMD64 folders.
-- buildDebSrc.sh, bash script for Linux to pack sources into Debian source package.
-- buildMac.sh, bash script to pack binaries from bin/MAC_gcc folder into DMG image.
-  3rd-party libraries should be already located in "bin/MAC_gcc_DEBUG/sView.app/Contents/Frameworks/"
-  folder with correct search path (refer to bind_frameworks.sh auxiliary script).
-
-===
-
-su
-yum install rpm-build
-
-mkdir -p ${HOME}/workspace/redhat/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
-echo "%_topdir ${HOME}/workspace/redhat" > ${HOME}/.rpmmacros
-
-wget https://launchpad.net/~sview/+archive/stable/+files/sview_12.05-1%7Eprecise.tar.gz
-mv sview_12.05-1~precise.tar.gz $HOME/workspace/redhat/SOURCES/sview_12.05-1.tar.gz
-rpmbuild -ba distribution/sView.rpm.spec

sview-15_10.tar.gz/textures/fullScreen128.png Deleted

sview-15_10.tar.gz/textures/fullScreen144.png Deleted

sview-15_10.tar.gz/textures/fullScreen16.png Deleted

sview-15_10.tar.gz/textures/fullScreen192.png Deleted

sview-15_10.tar.gz/textures/fullScreen24.png Deleted

sview-15_10.tar.gz/textures/fullScreen256.png Deleted

sview-15_10.tar.gz/textures/fullScreen32.png Deleted

sview-15_10.tar.gz/textures/fullScreen48.png Deleted

sview-15_10.tar.gz/textures/fullScreen64.png Deleted

sview-15_10.tar.gz/textures/fullScreen72.png Deleted

sview-15_10.tar.gz/textures/fullScreen96.png Deleted

sview-15_10.tar.gz/texturesSrc/fullscr.svg Deleted

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="32"
- height="32"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="fullscr.svg"
- inkscape:export-filename="fullScreen32.png"
- inkscape:export-xdpi="107.66355"
- inkscape:export-ydpi="107.66355">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="16.8125"
- inkscape:cx="14.929368"
- inkscape:cy="16"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1213"
- inkscape:window-height="756"
- inkscape:window-x="67"
- inkscape:window-y="0"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-1020.3622)">
- <path
- sodipodi:type="arc"
- style="fill:#808080;fill-opacity:0.45814981;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2985"
- sodipodi:cx="11.271376"
- sodipodi:cy="13.769517"
- sodipodi:rx="12.877323"
- sodipodi:ry="12.877323"
- d="m 24.148699,13.769517 a 12.877323,12.877323 0 1 1 -25.7546465,0 12.877323,12.877323 0 1 1 25.7546465,0 z"
- transform="translate(4.6988847,1022.6818)" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 8.386617,1035.2321 0.05948,-6.4238 6.245353,-0.06 z"
- id="path3755"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1"
- id="path3792"
- sodipodi:cx="16.08922"
- sodipodi:cy="16.684015"
- sodipodi:rx="1.457249"
- sodipodi:ry="1.457249"
- d="m 17.546469,16.684015 a 1.457249,1.457249 0 1 1 -2.914498,0 1.457249,1.457249 0 1 1 2.914498,0 z"
- transform="translate(-0.11895969,1019.7673)" />
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path3813"
- d="m 23.434944,1037.4918 -0.05948,6.4238 -6.245353,0.06 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- </g>
-</svg>

sview-15_11.tar.gz/3rdparty/FFmpeg/patches/patch_png_ster.patch Added

@@ -0,0 +1,94 @@
+From 104e5d8f212c46b9eedb932a6b6c717372ccdceb Mon Sep 17 00:00:00 2001
+From: Kirill Gavrilov <kirill@sview.ru>
+Date: Thu, 22 Oct 2015 23:36:52 +0300
+Subject: [PATCH 1/1] avcodec/png: read and write stereo3d frame side data
+ information
+
+Use optional sTER chunk defining side-by-side stereo pair
+within "Extensions to the PNG 1.2 Specification", version 1.3.0.
+---
+ libavcodec/pngdec.c | 16 ++++++++++++++++
+ libavcodec/pngenc.c | 19 +++++++++++++++++++
+ 2 files changed, 35 insertions(+)
+
+diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
+index 4cfdc58..99111d4 100644
+--- a/libavcodec/pngdec.c
++++ b/libavcodec/pngdec.c
+@@ -24,6 +24,7 @@
+ #include "libavutil/avassert.h"
+ #include "libavutil/bprint.h"
+ #include "libavutil/imgutils.h"
++#include "libavutil/stereo3d.h"
+ #include "avcodec.h"
+ #include "bytestream.h"
+ #include "internal.h"
+@@ -1164,6 +1165,21 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,
+ av_log(avctx, AV_LOG_WARNING, "Broken zTXt chunk\n");
+ bytestream2_skip(&s->gb, length + 4);
+ break;
++ case MKTAG('s', 'T', 'E', 'R'): {
++ AVStereo3D *stereo3d = av_stereo3d_create_side_data(p);
++ if (!stereo3d) {
++ goto fail;
++ } else if (*s->gb.buffer == 0) {
++ stereo3d->type = AV_STEREO3D_SIDEBYSIDE;
++ stereo3d->flags = AV_STEREO3D_FLAG_INVERT;
++ } else if (*s->gb.buffer == 1) {
++ stereo3d->type = AV_STEREO3D_SIDEBYSIDE;
++ } else {
++ av_log(avctx, AV_LOG_WARNING, "Broken sTER chunk - unknown value\n");
++ }
++ bytestream2_skip(&s->gb, length + 4);
++ break;
++ }
+ case MKTAG('I', 'E', 'N', 'D'):
+ if (!(s->state & PNG_ALLIMAGE))
+ av_log(avctx, AV_LOG_ERROR, "IEND without all image\n");
+diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
+index 4204df2..bc61f8f 100644
+--- a/libavcodec/pngenc.c
++++ b/libavcodec/pngenc.c
+@@ -31,6 +31,7 @@
+ #include "libavutil/libm.h"
+ #include "libavutil/opt.h"
+ #include "libavutil/color_utils.h"
++#include "libavutil/stereo3d.h"
+ 
+ #include <zlib.h>
+ 
+@@ -340,6 +341,7 @@ static int png_get_gama(enum AVColorTransferCharacteristic trc, uint8_t *buf)
+ 
+ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict)
+ {
++ AVFrameSideData *side_data;
+ PNGEncContext *s = avctx->priv_data;
+ 
+ /* write png header */
+@@ -364,6 +366,23 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict)
+ }
+ png_write_chunk(&s->bytestream, MKTAG('p', 'H', 'Y', 's'), s->buf, 9);
+ 
++ /* write stereoscopic information */
++ side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_STEREO3D);
++ if (side_data) {
++ AVStereo3D *stereo3d = (AVStereo3D *)side_data->data;
++ switch (stereo3d->type) {
++ case AV_STEREO3D_SIDEBYSIDE:
++ s->buf[0] = ((stereo3d->flags & AV_STEREO3D_FLAG_INVERT) == 0) ? 1 : 0;
++ png_write_chunk(&s->bytestream, MKTAG('s', 'T', 'E', 'R'), s->buf, 1);
++ break;
++ case AV_STEREO3D_2D:
++ break;
++ default:
++ av_log(avctx, AV_LOG_WARNING, "Only side-by-side stereo3d flag can be defined within sTER chunk\n");
++ break;
++ }
++ }
++
+ /* write colorspace information */
+ if (pict->color_primaries == AVCOL_PRI_BT709 &&
+ pict->color_trc == AVCOL_TRC_IEC61966_2_1) {
+-- 
+2.0.1
+

sview-15_10.tar.gz/3rdparty/FFmpeg/rebuild.sh -> sview-15_11.tar.gz/3rdparty/FFmpeg/rebuild.sh Changed

@@ -10,6 +10,8 @@
 rebuildAndroid="false"
 compilerPrefix=""
 androidNdkRoot="~/develop/android-ndk-r10"
+aSystem=`uname -s`
+aPwdBack=$PWD
 
 for i in $*
 do
@@ -70,10 +72,25 @@
   OUTPUT_NAME="$OUTPUT_NAME-debug"
 fi
 OUTPUT_FOLDER="../$OUTPUT_NAME"
+OUTPUT_FOLDER_INC="$OUTPUT_FOLDER/include"
+OUTPUT_FOLDER_BIN="$OUTPUT_FOLDER/bin"
+OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/lib"
+if [ "$aSystem" == "Darwin" ]; then
+  OUTPUT_FOLDER_BIN="$OUTPUT_FOLDER/MacOS"
+  OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/Frameworks"
+fi
 rm -f -r $OUTPUT_FOLDER
 mkdir -p $OUTPUT_FOLDER
-mkdir -p $OUTPUT_FOLDER/bin
-mkdir -p $OUTPUT_FOLDER/lib
+mkdir -p $OUTPUT_FOLDER_BIN
+mkdir -p $OUTPUT_FOLDER_LIB
+mkdir -p $OUTPUT_FOLDER_INC
+mkdir -p $OUTPUT_FOLDER_INC/libavcodec
+mkdir -p $OUTPUT_FOLDER_INC/libavdevice
+mkdir -p $OUTPUT_FOLDER_INC/libavfilter
+mkdir -p $OUTPUT_FOLDER_INC/libavformat
+mkdir -p $OUTPUT_FOLDER_INC/libavutil
+mkdir -p $OUTPUT_FOLDER_INC/libswscale
+mkdir -p $OUTPUT_FOLDER_INC/libswresample
 
 echo "  make distclean"
 make distclean &>/dev/null
@@ -89,21 +106,21 @@
   fi
 fi
 
+#--enable-memalign-hack
 configArguments="\
  --extra-version=sView.ru \
  --enable-swscale \
  --enable-shared \
  --disable-static \
- --enable-memalign-hack \
  --enable-avfilter \
  --enable-hardcoded-tables \
  --enable-pthreads \
  --disable-libopenjpeg \
+ --disable-doc \
  --enable-runtime-cpudetect"
 
-aSystem=`uname -s`
 if [ "$aSystem" == "Darwin" ]; then
-  configArguments="$configArguments --enable-vda"
+  configArguments="$configArguments --enable-vda --libdir=@executable_path/../Frameworks"
 fi
 
 #if [ "$gccMachine" != "$GCC_MACHINE_LINUX_64" ]; then
@@ -156,7 +173,7 @@
 echo "  ./configure $configArguments"
 echo
 if [ "$rebuildAndroid" == "true" ]; then
-  ./configure $configArguments --disable-symver --extra-cflags='-fno-builtin-sin -fno-builtin-sinf' >$OUTPUT_FOLDER/config.log 2>&1
+  ./configure $configArguments --disable-symver --extra-cflags='-march=armv7-a -mfloat-abi=softfp -fno-builtin-sin -fno-builtin-sinf' >$OUTPUT_FOLDER/config.log 2>&1
 else
   ./configure $configArguments >$OUTPUT_FOLDER/config.log 2>&1
 fi
@@ -178,85 +195,96 @@
   cp -f libavcodec/*.dll $OUTPUT_FOLDER
   cp -f libavcodec/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libavcodec/libavcodec.dylib ]; then
-  cp -f -p libavcodec/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libavcodec/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libavcodec/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libavcodec/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 if [ -f libavdevice/avdevice.dll ]; then
   cp -f libavdevice/*.dll $OUTPUT_FOLDER
   cp -f libavdevice/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libavdevice/libavdevice.dylib ]; then
-  cp -f -p libavdevice/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libavdevice/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libavdevice/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libavdevice/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 if [ -f libavfilter/avfilter.dll ]; then
   cp -f libavfilter/*.dll $OUTPUT_FOLDER
   cp -f libavfilter/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libavfilter/libavfilter.dylib ]; then
-  cp -f -p libavfilter/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libavfilter/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libavfilter/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libavfilter/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 if [ -f libavformat/avformat.dll ]; then
   cp -f libavformat/*.dll $OUTPUT_FOLDER
   cp -f libavformat/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libavformat/libavformat.dylib ]; then
-  cp -f -p libavformat/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libavformat/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libavformat/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libavformat/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 if [ -f libavutil/avutil.dll ]; then
   cp -f libavutil/*.dll $OUTPUT_FOLDER
   cp -f libavutil/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libavutil/libavutil.dylib ]; then
-  cp -f -p libavutil/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libavutil/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libavutil/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libavutil/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 if [ -f libswscale/swscale.dll ]; then
   cp -f libswscale/*.dll $OUTPUT_FOLDER
   cp -f libswscale/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libswscale/libswscale.dylib ]; then
-  cp -f -p libswscale/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libswscale/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libswscale/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libswscale/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 if [ -f libswresample/swresample.dll ]; then
   cp -f libswresample/*.dll $OUTPUT_FOLDER
   cp -f libswresample/*.lib $OUTPUT_FOLDER &>/dev/null
 elif [ -f libswresample/libswresample.dylib ]; then
-  cp -f -p libswresample/*.dylib* $OUTPUT_FOLDER/lib
+  cp -f -p -R libswresample/*.dylib* $OUTPUT_FOLDER_LIB
 else
-  cp -f -d libswresample/*.so* $OUTPUT_FOLDER/lib
+  cp -f -d libswresample/*.so* $OUTPUT_FOLDER_LIB
 fi
 
 cp -f *.exe      $OUTPUT_FOLDER &>/dev/null
-cp -f ffmpeg     $OUTPUT_FOLDER/bin &>/dev/null
-cp -f ffmpeg_g   $OUTPUT_FOLDER/bin &>/dev/null
-cp -f ffprobe    $OUTPUT_FOLDER/bin &>/dev/null
-cp -f ffprobe_g  $OUTPUT_FOLDER/bin &>/dev/null
-cp -f ffserver   $OUTPUT_FOLDER/bin &>/dev/null
-cp -f ffserver_g $OUTPUT_FOLDER/bin &>/dev/null
-cp -f ffplay     $OUTPUT_FOLDER/bin &>/dev/null
+cp -f ffmpeg     $OUTPUT_FOLDER_BIN &>/dev/null
+cp -f ffmpeg_g   $OUTPUT_FOLDER_BIN &>/dev/null
+cp -f ffprobe    $OUTPUT_FOLDER_BIN &>/dev/null
+cp -f ffprobe_g  $OUTPUT_FOLDER_BIN &>/dev/null
+cp -f ffserver   $OUTPUT_FOLDER_BIN &>/dev/null
+cp -f ffserver_g $OUTPUT_FOLDER_BIN &>/dev/null
+cp -f ffplay     $OUTPUT_FOLDER_BIN &>/dev/null
+
+cp -f libavcodec/*.h    $OUTPUT_FOLDER_INC/libavcodec    &>/dev/null
+cp -f libavdevice/*.h   $OUTPUT_FOLDER_INC/libavdevice   &>/dev/null
+cp -f libavfilter/*.h   $OUTPUT_FOLDER_INC/libavfilter   &>/dev/null
+cp -f libavformat/*.h   $OUTPUT_FOLDER_INC/libavformat   &>/dev/null
+cp -f libavutil/*.h     $OUTPUT_FOLDER_INC/libavutil     &>/dev/null
+cp -f libswscale/*.h    $OUTPUT_FOLDER_INC/libswscale    &>/dev/null
+cp -f libswresample/*.h $OUTPUT_FOLDER_INC/libswresample &>/dev/null
 
 # remove duplicates (only Windows)
 rm $OUTPUT_FOLDER/avcodec.dll $OUTPUT_FOLDER/swresample.dll $OUTPUT_FOLDER/avdevice.dll $OUTPUT_FOLDER/avfilter.dll $OUTPUT_FOLDER/avformat.dll $OUTPUT_FOLDER/avutil.dll $OUTPUT_FOLDER/swscale.dll &>/dev/null
 
 # create binaries archive
-if command -v 7za &>/dev/null
+if [ "$aSystem" == "Darwin" ]; then
+  rm $OUTPUT_FOLDER/../$OUTPUT_NAME.tar.gz &>/dev/null
+  cd $OUTPUT_FOLDER
+  tar -cvzf $OUTPUT_FOLDER/../$OUTPUT_NAME.tar.gz *
+elif command -v 7za &>/dev/null
 then
-  # binaries
   rm $OUTPUT_FOLDER/../$OUTPUT_NAME.7z &>/dev/null
   7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../$OUTPUT_NAME.7z $OUTPUT_FOLDER
-  rm -f -r $OUTPUT_FOLDER
 fi
 
 # come back
-cd ..
+cd $aPwdBack
+#rm -f -r $OUTPUT_FOLDER

sview-15_10.tar.gz/3rdparty/FFmpeg/rebuildBatch.sh -> sview-15_11.tar.gz/3rdparty/FFmpeg/rebuildBatch.sh Changed

@@ -2,15 +2,15 @@
 
 # This is helpful script to perform building of FFmpeg
 
-# MinGW tools for Ubuntu; http://ffmpeg.arrozcru.org/wiki/index.php?title=Aptrepository
-# Add gpg key to your system 
-#$ gpg --keyserver keyserver.ubuntu.com --recv-key 0x25E635F9
-#$ gpg --export --armor 0x25E635F9 | sudo apt-key add -
-#deb http://apt.arrozcru.org ./
-#deb-src http://apt.arrozcru.org ./
+# mingw for cross-compiling
+#sudo apt-get install binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-base gcc-mingw-w64-i686 gcc-mingw-w64-x86-64
+#sudo apt-get install mingw-w64 mingw-w64-common mingw-w64-tools yasm p7zip-full git git-gui gitk
 
-#sudo apt-get install mingw32-w32api mingw32-runtime mingw32-gcc-4.4 mingw32-binutils mingw32-zlib mingw32-bzip2 mingw32-pthreads 
-#sudo apt-get install mingw-w64-w32api mingw-w64-runtime mingw-w64-gcc-4.4 mingw-w64-crt mingw-w64-binutils mingw-w64-headers mingw-w64-zlib mingw-w64-bzip2 mingw-w64-pthreads
+# avoid linkage with dynamic version of libwinpthread.dll
+#sudo mv /usr/x86_64-w64-mingw32/lib/libpthread.dll.a /usr/x86_64-w64-mingw32/lib/__libpthread.dll.a
+#sudo mv /usr/x86_64-w64-mingw32/lib/libwinpthread.dll.a /usr/x86_64-w64-mingw32/lib/__libwinpthread.dll.a
+#sudo mv /usr/i686-w64-mingw32/lib/libpthread.dll.a /usr/i686-w64-mingw32/lib/__libpthread.dll.a
+#sudo mv /usr/i686-w64-mingw32/lib/libwinpthread.dll.a /usr/i686-w64-mingw32/lib/__libwinpthread.dll.a
 
 rebuildTarget="FFmpeg"
 if [ "$1" != "" ]; then
@@ -35,10 +35,10 @@
 fi
 
 # build for Win32 x86
-#./rebuild.sh "$rebuildTarget" GPL  DEBUG   "i686-mingw32-"
-./rebuild.sh "$rebuildTarget" LGPL DEBUG   "i686-mingw32-"
-./rebuild.sh "$rebuildTarget" GPL  RELEASE "i686-mingw32-"
-./rebuild.sh "$rebuildTarget" LGPL RELEASE "i686-mingw32-"
+#./rebuild.sh "$rebuildTarget" GPL  DEBUG   "i686-w64-mingw32-"
+./rebuild.sh "$rebuildTarget" LGPL DEBUG   "i686-w64-mingw32-"
+./rebuild.sh "$rebuildTarget" GPL  RELEASE "i686-w64-mingw32-"
+./rebuild.sh "$rebuildTarget" LGPL RELEASE "i686-w64-mingw32-"
 
 # build for Win32 AMD64
 #./rebuild.sh "$rebuildTarget" GPL  DEBUG   "x86_64-w64-mingw32-"

sview-15_11.tar.gz/LICENSE.md Added

@@ -0,0 +1,60 @@
+## Libraries
+
+* StShared
+* StGLWidget
+* StCore
+* StOutAnaglyph
+* StOutDual
+* StOutInterlace
+* StOutIZ3D
+* StOutPageFlip
+
+Sources of these libraries are under Boost license.
+Read the file [license-boost.txt](license-boost.txt) for details.
+
+Notice that some sources are wrappers over other 3rd-parties
+and their licenses should be taken into account when used.
+
+## sView
+
+* StImageViewer
+* StMoviePlayer
+* StDiagnostics
+* StMonitorsDump
+* StBrowserPlugin
+* StTests
+
+These libraries and programs are under the GNU General Public License version 3.0 or later. 
+Read the file [license-gpl-3.0.txt](license-gpl-3.0.txt) for details.
+
+Note that sView executable project is a dummy entry point to real applications like StImageViewer. 
+Formally it was licensed under Boost license terms.
+
+## StCADViewer
+
+This program is under the GNU General Public License version 3.0 or later.
+
+## External libraries
+
+* FFmpeg libraries are distributed under GNU Lesser General Public License version 2.1 or later. 
+ http://ffmpeg.org/
+* libconfig++ library distributed under GNU Lesser General Public License version 2.1 or later. 
+ http://www.hyperrealm.com/libconfig/
+* OpenAL library distributed under GNU Lesser General Public License version 2.1 or later. 
+ http://kcat.strangesoft.net/openal.html
+* FreeType library distributed under FreeType License (BSD-style license with a credit clause). 
+ http://www.freetype.org/
+* Open CASCADE Technology libraries distributed under GNU Lesser General Public License version 2.1. 
+ http://dev.opencascade.org/
+
+Some 3rd-parties may depend on other libraries and provide more license options.
+Please read license information for original projects.
+
+## Icons
+
+Images in folders [texturesSrc](texturesSrc) and [textures](textures)
+are available under the [license CC-BY 4.0](license-CC-BY-4.0.txt) (Creative Common Attribution 4.0 International License).
+Feel free to remix and re-share these icons in your products.
+
+Some of the images have been derived from Material Design icons shared by Google: 
+https://github.com/google/material-design-icons

sview-15_11.tar.gz/README.md Added

@@ -0,0 +1,39 @@
+sView - stereoscopic media player
+=================================
+
+sView is an easy to use cross-platform solution to view 3D stereoscopic videos and images.
+Please visit official site for more information: 
+http://www.sview.ru
+
+## Libraries
+
+* `libStShared` threads, mutexes, template-based signals and slots, OpenGL tools, settings management, and other tools.
+* `libStGLWidgets` compact C++ toolkit for writing GUI using OpenGL 2.1+ or OpenGL ES 2.0+.
+* `libStCore` window system independent C++ toolkit for writing OpenGL applications.
+* `libStOutAnaglyph` stereoscopic output in anaglyph format using GLSL programs.
+* `libStOutDistorted` stereoscopic output in anamorph side-by-side format.
+* `libStOutDual` stereoscopic output through two dedicated interfaces.
+* `libStOutInterlace` stereoscopic output for row interlaced displays using GLSL programs.
+* `libStOutIZ3D` stereoscopic output for iZ3D monitors using GLSL programs.
+* `libStOutPageFlip` stereoscopic output for shutter glasses devices.
+
+## Updates
+
+To get up-to-date sources please clone official git repository:
+~~~~~
+ git clone https://github.com/gkv311/sview.git
+~~~~~
+
+## Documentation
+
+Read the documentation in the **doc/** directory in git.
+Online help is available on official site: 
+http://www.sview.ru/en/sview/usertips/
+
+## Licensing
+
+See the [LICENSE](LICENSE.md) file.
+
+## Build and Install
+
+See the [docs/INSTALL](docs/INSTALL.md) file.

sview-15_10.tar.gz/StBrowserPlugin/StBrowserPlugin.cbp -> sview-15_11.tar.gz/StBrowserPlugin/StBrowserPlugin.cbp Changed

@@ -6,32 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/npStBrowserPlugin" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-D__MSVCRT_VERSION__=0x0601" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add option="--input-def StBrowserPluginNPAPI.def" />
-					<Add library="user32" />
-					<Add library="advapi32" />
-					<Add library="shell32" />
-					<Add library="Version" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/npStBrowserPlugin" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -65,11 +39,11 @@
 					<Add before='midl /nologo /win32 /W1 $res_includes /client none /tlb &quot;$(TARGET_OBJECT_DIR)\StActiveX.idl.tlb&quot; StActiveX.idl' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/npStBrowserPlugin" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Compiler>
 					<Add option="/MDd" />
 					<Add option="/Od" />
@@ -95,7 +69,7 @@
 					<Add library="advapi32" />
 					<Add library="shell32" />
 					<Add library="Version" />
-					<Add directory="../3rdparty/atlmfc/lib" />
+					<Add directory="../3rdparty/atlmfc/lib/amd64" />
 				</Linker>
 				<ExtraCommands>
 					<Add before='cmd /c IF NOT EXIST &quot;$(TARGET_OBJECT_DIR)&quot; MKDIR &quot;$(TARGET_OBJECT_DIR)&quot;' />
@@ -255,40 +229,33 @@
 		<Unit filename="NSPluginBase.h" />
 		<Unit filename="StActiveX.idl">
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StActiveXCtrl.cpp">
 			<Option weight="40" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StActiveXCtrl.h" />
 		<Unit filename="StActiveXModule.cpp">
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StActiveXModule.h" />
 		<Unit filename="StBrPluginInfo.h" />
 		<Unit filename="StBrowserPlugin.cpp" />
-		<Unit filename="StBrowserPlugin.def">
-			<Option target="WIN_gcc_x86" />
-		</Unit>
 		<Unit filename="StBrowserPlugin.h" />
 		<Unit filename="StBrowserPlugin.rc">
 			<Option compilerVar="WINDRES" />
 			<Option compiler="windows_sdk_x86_64" use="1" buildCommand='$rescomp -DST_OCX_TLB_PATH=&quot;$(TARGET_OBJECT_DIR)/StActiveX.idl.tlb&quot; $res_includes -fo $resource_output $file' />
-			<Option compiler="windows_sdk_x86" use="1" buildCommand='$rescomp -DST_OCX_TLB_PATH=&quot;$(TARGET_OBJECT_DIR)/StActiveX.idl.tlb&quot; $res_includes -fo $resource_output $file' />
-			<Option target="WIN_gcc_x86" />
+			<Option compiler="msvc10" use="1" buildCommand='$rescomp -DST_OCX_TLB_PATH=&quot;$(TARGET_OBJECT_DIR)/StActiveX.idl.tlb&quot; $res_includes -fo $resource_output $file' />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
-		<Unit filename="StBrowserPluginNPAPI.def">
-			<Option target="WIN_gcc_x86" />
-		</Unit>
 		<Unit filename="npEntry.cpp" />
 		<Unit filename="npapi.h" />
 		<Unit filename="npfunctions.h" />

sview-15_10.tar.gz/StCADViewer/StCADViewer.cbp -> sview-15_11.tar.gz/StCADViewer/StCADViewer.cbp Changed

@@ -6,41 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStCADViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option parameters="--in=StCADViewer" />
-				<Option host_application="../bin/$(TARGET_NAME)/sView" />
-				<Option run_host_application_in_terminal="0" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DWNT" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Comdlg32" />
-					<Add library="shell32" />
-					<Add library="Wsock32" />
-					<Add library="Version" />
-					<Add directory="../3rdparty/OCCT/lib/WIN_vc_x86" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StCADViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -77,11 +42,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StCADViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option parameters="--in=StCADViewer" />
 				<Option host_application="../bin/$(TARGET_NAME)/sView" />
 				<Option run_host_application_in_terminal="0" />
@@ -112,7 +77,7 @@
 					<Add library="shell32" />
 					<Add library="Wsock32" />
 					<Add library="Version" />
-					<Add directory="../3rdparty/OCCT/lib/WIN_vc_x86" />
+					<Add directory="../3rdparty/OCCT/lib/WIN_vc_AMD64" />
 				</Linker>
 				<ExtraCommands>
 					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
@@ -306,9 +271,8 @@
 		<Unit filename="StCADViewer.h" />
 		<Unit filename="StCADViewer.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StCADViewerGUI.cpp" />

sview-15_10.tar.gz/StCADViewer/StCADViewer.cpp -> sview-15_11.tar.gz/StCADViewer/StCADViewer.cpp Changed

sview-15_10.tar.gz/StCADViewer/lang/chinese/StCADViewer.lng -> sview-15_11.tar.gz/StCADViewer/lang/chinese/StCADViewer.lng Changed

@@ -2,25 +2,25 @@
 @author Kirill Gavrilov
 
 --------
-1200="View"
-1201="Projection type"
-1202="Fullscreen"
-1203="Show normals"
-1204="Show trihedron"
-1205="Two sides lighting"
-1206="Projection"
-1207="Fill Mode"
-1208="Fit ALL"
-1240="Orthogonal"
-1241="Perspective"
-1242="Stereo"
-1250="Mesh"
-1251="Shaded"
-1252="Shaded + Mesh"
-1500="Help"
-1501="About..."
-1503="License text"
-1504="Language"
-3000="sView - Tiny CAD Viewer"
-3001="version"
-3002="CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru"
+?1200=View
+?1201=Projection type
+?1202=Fullscreen
+?1203=Show normals
+?1204=Show trihedron
+?1205=Two sides lighting
+?1206=Projection
+?1207=Fill Mode
+?1208=Fit ALL
+?1240=Orthogonal
+?1241=Perspective
+?1242=Stereo
+?1250=Mesh
+?1251=Shaded
+?1252=Shaded + Mesh
+?1500=Help
+?1501=About...
+?1503=License text
+?1504=Language
+?3000=sView - Tiny CAD Viewer
+?3001=version
+?3002=CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru

sview-15_10.tar.gz/StCADViewer/lang/english/StCADViewer.lng -> sview-15_11.tar.gz/StCADViewer/lang/english/StCADViewer.lng Changed

@@ -1,25 +1,25 @@
 # English translation file for StCADViewer
 # @author Kirill Gavrilov
 --------
-1200="View"
-1201="Projection type"
-1202="Fullscreen"
-1203="Show normals"
-1204="Show trihedron"
-1205="Two sides lighting"
-1206="Projection"
-1207="Fill Mode"
-1208="Fit ALL"
-1240="Orthogonal"
-1241="Perspective"
-1242="Stereo"
-1250="Mesh"
-1251="Shaded"
-1252="Shaded + Mesh"
-1500="Help"
-1501="About..."
-1503="License text"
-1504="Language"
-3000="sView - Tiny CAD Viewer"
-3001="version"
-3002="CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru"
+1200=View
+1201=Projection type
+1202=Fullscreen
+1203=Show normals
+1204=Show trihedron
+1205=Two sides lighting
+1206=Projection
+1207=Fill Mode
+1208=Fit ALL
+1240=Orthogonal
+1241=Perspective
+1242=Stereo
+1250=Mesh
+1251=Shaded
+1252=Shaded + Mesh
+1500=Help
+1501=About...
+1503=License text
+1504=Language
+3000=sView - Tiny CAD Viewer
+3001=version
+3002=CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru

sview-15_10.tar.gz/StCADViewer/lang/french/StCADViewer.lng -> sview-15_11.tar.gz/StCADViewer/lang/french/StCADViewer.lng Changed

@@ -1,25 +1,25 @@
 # French translation file for StCADViewer
 # @author Kirill Gavrilov
 --------
-1200="Voir"
-1201="Type de projection"
-1202="Plein Ecran"
-1203="Show normals"
-1204="Show trihedron"
-1205="Two sides lighting"
-1206="Projection"
-1207="Fill Mode"
-1208="Fit ALL"
-1240="Orthogonal"
-1241="Perspective"
-1242="Stereo"
-1250="Mesh"
-1251="Shaded"
-1252="Shaded + Mesh"
-1500="Aide"
-1501="A Propos..."
-1503="Texte de la Licence"
-1504="Language"
-3000="sView - Tiny CAD Viewer"
-3001="version"
-3002="CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru"
+1200=Voir
+1201=Type de projection
+1202=Plein Ecran
+?1203=Show normals
+?1204=Show trihedron
+?1205=Two sides lighting
+?1206=Projection
+?1207=Fill Mode
+?1208=Fit ALL
+?1240=Orthogonal
+?1241=Perspective
+?1242=Stereo
+?1250=Mesh
+?1251=Shaded
+?1252=Shaded + Mesh
+1500=Aide
+1501=A Propos...
+1503=Texte de la Licence
+1504=Language
+3000=sView - Tiny CAD Viewer
+3001=version
+?3002=CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru

sview-15_10.tar.gz/StCADViewer/lang/german/StCADViewer.lng -> sview-15_11.tar.gz/StCADViewer/lang/german/StCADViewer.lng Changed

@@ -1,25 +1,25 @@
 # German translation file for StCADViewer
 # @author Kirill Gavrilov
 --------
-1200="Ansicht"
-1201="Projection type"
-1202="Vollbild"
-1203="Normalen anzeigen"
-1204="Dreibein anzeigen"
-1205="Zwei einseitige Beleuchtung"
-1206="Projektion"
-1207="Füllmodus"
-1208="Fit ALL"
-1240="Orthogonal"
-1241="Perspektive"
-1242="Stereo"
-1250="Mesh"
-1251="Beschattet"
-1252="Beschattet + Mesh"
-1500="Hilfe"
-1501="Über..."
-1503="Lizenztext"
-1504="Language"
-3000="sView - winzig CAD Viewer"
-3001="Version"
-3002="CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru"
+1200=Ansicht
+1201=Projection type
+1202=Vollbild
+1203=Normalen anzeigen
+1204=Dreibein anzeigen
+1205=Zwei einseitige Beleuchtung
+1206=Projektion
+1207=Füllmodus
+?1208=Fit ALL
+1240=Orthogonal
+1241=Perspektive
+1242=Stereo
+1250=Mesh
+1251=Beschattet
+1252=Beschattet + Mesh
+1500=Hilfe
+1501=Über...
+1503=Lizenztext
+1504=Language
+3000=sView - winzig CAD Viewer
+3001=Version
+3002=CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru

sview-15_10.tar.gz/StCADViewer/lang/korean/StCADViewer.lng -> sview-15_11.tar.gz/StCADViewer/lang/korean/StCADViewer.lng Changed

@@ -2,25 +2,25 @@
 @author Kirill Gavrilov
 
 --------
-1200="View"
-1201="Projection type"
-1202="Fullscreen"
-1203="Show normals"
-1204="Show trihedron"
-1205="Two sides lighting"
-1206="Projection"
-1207="Fill Mode"
-1208="Fit ALL"
-1240="Orthogonal"
-1241="Perspective"
-1242="Stereo"
-1250="Mesh"
-1251="Shaded"
-1252="Shaded + Mesh"
-1500="Help"
-1501="About..."
-1503="License text"
-1504="Language"
-3000="sView - Tiny CAD Viewer"
-3001="version"
-3002="CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru"
+?1200=View
+?1201=Projection type
+?1202=Fullscreen
+?1203=Show normals
+?1204=Show trihedron
+?1205=Two sides lighting
+?1206=Projection
+?1207=Fill Mode
+?1208=Fit ALL
+?1240=Orthogonal
+?1241=Perspective
+?1242=Stereo
+?1250=Mesh
+?1251=Shaded
+?1252=Shaded + Mesh
+?1500=Help
+?1501=About...
+?1503=License text
+?1504=Language
+?3000=sView - Tiny CAD Viewer
+?3001=version
+?3002=CAD viewer allows you to view CAD files in formats IGES, STEP, BREP using OpenCASCADE Technology.\n © 2011-2014 Kirill Gavrilov (kirill@sview.ru).\nOfficial site: www.sview.ru

sview-15_10.tar.gz/StCADViewer/lang/russian/StCADViewer.lng -> sview-15_11.tar.gz/StCADViewer/lang/russian/StCADViewer.lng Changed

@@ -1,25 +1,25 @@
 # Russian translation file for StCADViewer
 # @author Kirill Gavrilov
 --------
-1200="Вид"
-1201="Тип проекции"
-1202="Полный экран"
-1203="Отображать нормали"
-1204="Show trihedron"
-1205="Two sides lighting"
-1206="Проекция"
-1207="Fill Mode"
-1208="Вписать модель"
-1240="Ортогональная"
-1241="Перспективная"
-1242="Стерео"
-1250="Mesh"
-1251="Shaded"
-1252="Shaded + Mesh"
-1500="Помощь"
-1501="О программе..."
-1503="Открыть лицензию"
-1504="Language"
-3000="sView - приложение для просмотра CAD моделей"
-3001="версия"
-3002="Программа открывает CAD модели в форматах IGES, STEP, BREP с помощью OpenCASCADE Technology.\n © 2011-2014 Гаврилов Кирилл (kirill@sview.ru).\nОфициальный сайт: www.sview.ru"
+1200=Вид
+1201=Тип проекции
+1202=Полный экран
+1203=Отображать нормали
+1204=Show trihedron
+1205=Two sides lighting
+1206=Проекция
+1207=Fill Mode
+1208=Вписать модель
+1240=Ортогональная
+1241=Перспективная
+1242=Стерео
+1250=Mesh
+1251=Shaded
+1252=Shaded + Mesh
+1500=Помощь
+1501=О программе...
+1503=Открыть лицензию
+1504=Language
+3000=sView - приложение для просмотра CAD моделей
+3001=версия
+3002=Программа открывает CAD модели в форматах IGES, STEP, BREP с помощью OpenCASCADE Technology.\n © 2011-2014 Гаврилов Кирилл (kirill@sview.ru).\nОфициальный сайт: www.sview.ru

sview-15_10.tar.gz/StCore/StADLsdk.cpp -> sview-15_11.tar.gz/StCore/StADLsdk.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __APPLE__
@@ -27,7 +18,7 @@
 #elif(defined(__linux__) || defined(__linux))
 static const char LIB_NAME[] = "libatiadlxx";
 #endif
-};
+}
 
 bool StADLsdk::countAdapters() {
 if(myFunctions.ADL_Adapter_AdapterInfo_Get == NULL

sview-15_10.tar.gz/StCore/StADLsdk.h -> sview-15_11.tar.gz/StCore/StADLsdk.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __APPLE__

sview-15_10.tar.gz/StCore/StAndroidGlue.cpp -> sview-15_11.tar.gz/StCore/StAndroidGlue.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if defined(__ANDROID__)
@@ -51,6 +42,54 @@
 return stCString("UNKNOWN");
 }
 
+/**
+ * Read string from jstring.
+ */
+inline StString stStringFromJava(JNIEnv* theJEnv,
+ jstring theJString) {
+ if(theJString == NULL) {
+ return StString();
+ }
+
+ const char* aJStringStr = theJEnv->GetStringUTFChars(theJString, 0);
+ const StString aString = aJStringStr;
+ theJEnv->ReleaseStringUTFChars(theJString, aJStringStr);
+ return aString;
+}
+
+StString StAndroidGlue::getStoragePath(JNIEnv* theJEnv,
+ const char* theType) {
+ jclass aJClass_Env = theJEnv->FindClass("android/os/Environment");
+ jclass aJClass_File = theJEnv->FindClass("java/io/File");
+ if(aJClass_Env == NULL
+ || aJClass_File == NULL) {
+ return StString();
+ }
+
+ jmethodID aJMet_getStorage = theJEnv->GetStaticMethodID(aJClass_Env, "getExternalStoragePublicDirectory", "(Ljava/lang/String;)Ljava/io/File;");
+ jmethodID aJMet_getSdCard = theJEnv->GetStaticMethodID(aJClass_Env, "getExternalStorageDirectory", "()Ljava/io/File;");
+ jmethodID aJMet_getPath = theJEnv->GetMethodID (aJClass_File, "getAbsolutePath", "()Ljava/lang/String;");
+ if(aJMet_getStorage == NULL
+ || aJMet_getSdCard == NULL
+ || aJMet_getPath == NULL) {
+ return StString();
+ }
+
+ StString aType = theType;
+ jobject aJFile = NULL;
+ if(aType == "sdcard") {
+ aJFile = theJEnv->CallStaticObjectMethod(aJClass_Env, aJMet_getSdCard);
+ } else {
+ jstring aJStr_Type = theJEnv->NewStringUTF(theType);
+ aJFile = theJEnv->CallStaticObjectMethod(aJClass_Env, aJMet_getStorage, aJStr_Type);
+ theJEnv->DeleteLocalRef(aJStr_Type);
+ }
+ if(aJFile == NULL) {
+ return StString();
+ }
+ return stStringFromJava(theJEnv, (jstring )theJEnv->CallObjectMethod(aJFile, aJMet_getPath));
+}
+
 StAndroidGlue::StAndroidGlue(ANativeActivity* theActivity,
 void* theSavedState,
 size_t theSavedStateSize)
@@ -92,6 +131,9 @@
 myMemoryClassMiB = aJniEnv->CallIntMethod(aJActivityMgr, aJMet_getMemoryClass);
 }
 
+ jmethodID aJMet_getStAppClass = aJniEnv->GetMethodID(aJClass_Activity, "getStAppClass", "()Ljava/lang/String;");
+ myStAppClass = stStringFromJava(aJniEnv, (jstring )aJniEnv->CallObjectMethod(myActivity->clazz, aJMet_getStAppClass));
+
 readOpenPath();
 
 myCmdPollSource.id = LooperId_MAIN;
@@ -150,17 +192,10 @@
 jmethodID aJMet_getFlags = aJniEnv->GetMethodID(aJClassIntent, "getFlags", "()I");
 
 // retrieve data path
- jstring aJString = (jstring )aJniEnv->CallObjectMethod(aJIntent, aJMet_getDataString);
- const char* aJStringStr = aJniEnv->GetStringUTFChars(aJString, 0);
- StString aDataPath = aJStringStr;
- aJniEnv->ReleaseStringUTFChars(aJString, aJStringStr);
-
+ StString aDataPath = stStringFromJava(aJniEnv, (jstring )aJniEnv->CallObjectMethod(aJIntent, aJMet_getDataString));
 // retrieve data type
- int aFlags = aJniEnv->CallIntMethod(aJIntent, aJMet_getFlags);
- aJString = (jstring )aJniEnv->CallObjectMethod(aJIntent, aJMet_getType);
- aJStringStr = aJniEnv->GetStringUTFChars(aJString, 0);
- const StString aDataType = aJStringStr;
- aJniEnv->ReleaseStringUTFChars(aJString, aJStringStr);
+ int aFlags = aJniEnv->CallIntMethod(aJIntent, aJMet_getFlags);
+ const StString aDataType = stStringFromJava(aJniEnv, (jstring )aJniEnv->CallObjectMethod(aJIntent, aJMet_getType));
 
 // reset intent in Activity
 aJniEnv->CallVoidMethod(myActivity->clazz, aJMet_setIntent, NULL);

sview-15_10.tar.gz/StCore/StApplication.cpp -> sview-15_11.tar.gz/StCore/StApplication.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include <StCore/StApplication.h>
@@ -330,9 +321,25 @@
 //return myActions.at(theActionId);
 }
 
+int StApplication::getActionIdFromName(const StString& theActionName) const {
+ StString aNameLower = theActionName;
+ aNameLower.toLowerCase();
+ const std::string aName(aNameLower.toCString());
+ std::map< std::string, int >::const_iterator anAction = myActionLookup.find(aName);
+ return anAction != myActionLookup.end()
+ ? anAction->second
+ : -1;
+}
+
 void StApplication::addAction(const int theActionId,
 const StHandle<StAction>& theAction) {
 myActions[theActionId] = theAction;
+ if(!theAction.isNull()) {
+ StString aNameLower = theAction->getName();
+ aNameLower.toLowerCase();
+ const std::string aName(aNameLower.toCString());
+ myActionLookup[aName] = theActionId;
+ }
 }
 
 void StApplication::addAction(const int theActionId,

sview-15_10.tar.gz/StCore/StCocoaView.h -> sview-15_11.tar.gz/StCore/StCocoaView.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))

sview-15_10.tar.gz/StCore/StCocoaView.mm -> sview-15_11.tar.gz/StCore/StCocoaView.mm Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))
@@ -27,6 +18,8 @@
 
 #include <StCocoa/StCocoaString.h>
 
+#include <vector>
+
 #if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
 @interface NSOpenGLView (LionAPI)
 - (void )setWantsBestResolutionOpenGLSurface: (BOOL )theFlag;
@@ -497,6 +490,7 @@
 return NO;
 }
 
+ std::vector<StString> aPaths;
 for(NSUInteger aFileId = 0; aFileId < [aFiles count]; ++aFileId) {
 NSString* aFilePathNs = (NSString* )[aFiles objectAtIndex: aFileId];
 if(aFilePathNs == NULL
@@ -506,9 +500,18 @@
 
 // automatically convert filenames from decomposed form used by Mac OS X file systems
 const StString aFile = [[aFilePathNs precomposedStringWithCanonicalMapping] UTF8String];
+ aPaths.push_back(aFile);
+ }
+
+ std::vector<const char*> aDndList;
+ for(std::vector<StString>::const_iterator aFileIter = aPaths.begin(); aFileIter != aPaths.end(); ++aFileIter) {
+ aDndList.push_back(aFileIter->toCString());
+ }
+ if(!aDndList.empty()) {
 myStEvent.Type = stEvent_FileDrop;
- myStEvent.DNDrop.Time = myStWin->getEventTime();
- myStEvent.DNDrop.File = aFile.toCString();
+ myStEvent.DNDrop.Time = myStWin->getEventTime();
+ myStEvent.DNDrop.NbFiles = aDndList.size();
+ myStEvent.DNDrop.Files = &aDndList[0];
 if(myStWin->myEventsThreaded) {
 myStWin->myEventsBuffer.append(myStEvent);
 } else {

sview-15_10.tar.gz/StCore/StCocoaWin.h -> sview-15_11.tar.gz/StCore/StCocoaWin.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))

sview-15_10.tar.gz/StCore/StCocoaWin.mm -> sview-15_11.tar.gz/StCore/StCocoaWin.mm Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))

sview-15_10.tar.gz/StCore/StCore.cbp -> sview-15_11.tar.gz/StCore/StCore.cbp Changed

@@ -6,34 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/StCore" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-D_WIN32_WINNT=0x0502" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Comdlg32" />
-					<Add library="Winmm" />
-					<Add library="Version" />
-					<Add library="nvapi" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StCore" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -66,11 +38,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StCore" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -262,9 +234,8 @@
 			<Add directory="../bin/$(TARGET_NAME)" />
 		</Linker>
 		<Unit filename="StADLsdk.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 			<Option target="LINUX_gcc" />
 			<Option target="LINUX_gcc_DEBUG" />
@@ -299,8 +270,7 @@
 			<Option compilerVar="WINDRES" />
 			<Option target="WIN_vc_x86" />
 			<Option target="WIN_vc_AMD64" />
-			<Option target="WIN_gcc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 		</Unit>
 		<Unit filename="StEventsBuffer.h" />
 		<Unit filename="StKeysState.cpp" />
@@ -318,9 +288,8 @@
 			<Option target="MAC_gcc_DEBUG" />
 		</Unit>
 		<Unit filename="StWinHandles.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 			<Option target="LINUX_gcc" />
 			<Option target="LINUX_gcc_DEBUG" />
@@ -344,9 +313,8 @@
 			<Option target="MAC_gcc_DEBUG" />
 		</Unit>
 		<Unit filename="StWindowImplWin.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StXDisplay.cpp">
@@ -354,6 +322,7 @@
 			<Option target="LINUX_gcc_DEBUG" />
 		</Unit>
 		<Unit filename="StXDisplay.h" />
+		<Unit filename="stvkeysandroid.h" />
 		<Unit filename="stvkeyscarbon.h">
 			<Option target="MAC_gcc" />
 			<Option target="MAC_gcc_DEBUG" />
@@ -361,6 +330,9 @@
 		<Unit filename="stvkeysxarray.h" />
 		<Unit filename="zerosarray256.h" />
 		<Unit filename="zerosarray4096.h" />
+		<Unit filename="../include/StCore/StAndroidGlue.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="../include/StCore/StApplication.h">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>

sview-15_10.tar.gz/StCore/StEventsBuffer.h -> sview-15_11.tar.gz/StCore/StEventsBuffer.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StEventsBuffer_h_
@@ -104,12 +95,32 @@
 StEvent& anEvent = myEventsWrite[mySizeWrite++];
 anEvent = theEvent;
 if(theEvent.Type == stEvent_FileDrop) {
- // copy buffer
- const size_t aSize = std::strlen(theEvent.DNDrop.File);
- char* aBuffer = new char[aSize + 1];
- stMemCpy(aBuffer, theEvent.DNDrop.File, aSize);
- aBuffer[aSize] = '\0';
- anEvent.DNDrop.File = aBuffer;
+ if(theEvent.DNDrop.NbFiles == 0) {
+ anEvent.DNDrop.Files = NULL;
+ return;
+ }
+
+ // make a copy in C-style
+ anEvent.DNDrop.Files = stMemAlloc<const char**>(sizeof(const char* ) * theEvent.DNDrop.NbFiles);
+ if(anEvent.DNDrop.Files == NULL) {
+ anEvent.DNDrop.NbFiles = 0;
+ return;
+ }
+
+ stMemZero(anEvent.DNDrop.Files, sizeof(const char* ) * theEvent.DNDrop.NbFiles);
+ for(uint32_t aFileIter = 0; aFileIter < theEvent.DNDrop.NbFiles; ++aFileIter) {
+ const char* aBufferSrc = theEvent.DNDrop.Files[aFileIter];
+ const size_t aSize = std::strlen(aBufferSrc);
+ char* aBufferDst = stMemAlloc<char*>(sizeof(char) * aSize + 1);
+ if(aBufferDst == NULL) {
+ anEvent.DNDrop.NbFiles = aFileIter;
+ return;
+ }
+
+ stMemCpy(aBufferDst, aBufferSrc, aSize);
+ aBufferDst[aSize] = '\0';
+ anEvent.DNDrop.Files[aFileIter] = aBufferDst;
+ }
 }
 }
 
@@ -121,8 +132,12 @@
 for(size_t anIter = 0; anIter < mySizeRead; ++anIter) {
 StEvent& anEvent = myEventsRead[anIter];
 if(anEvent.Type == stEvent_FileDrop) {
- delete[] anEvent.DNDrop.File;
- anEvent.DNDrop.File = NULL;
+ for(uint32_t aFileIter = 0; aFileIter < anEvent.DNDrop.NbFiles; ++aFileIter) {
+ stMemFree((void* )anEvent.DNDrop.Files[aFileIter]);
+ }
+ stMemFree(anEvent.DNDrop.Files);
+ anEvent.DNDrop.Files = NULL;
+ anEvent.DNDrop.NbFiles = 0;
 }
 }

sview-15_10.tar.gz/StCore/StKeysState.cpp -> sview-15_11.tar.gz/StCore/StKeysState.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include <StCore/StKeysState.h>

sview-15_10.tar.gz/StCore/StSearchMonitors.ObjC.mm -> sview-15_11.tar.gz/StCore/StSearchMonitors.ObjC.mm Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include <StCore/StSearchMonitors.h>

sview-15_10.tar.gz/StCore/StSearchMonitors.cpp -> sview-15_11.tar.gz/StCore/StSearchMonitors.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include <StCore/StSearchMonitors.h>

sview-15_10.tar.gz/StCore/StWinHandles.ObjC.mm -> sview-15_11.tar.gz/StCore/StWinHandles.ObjC.mm Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StWinHandles.h"

sview-15_10.tar.gz/StCore/StWinHandles.cpp -> sview-15_11.tar.gz/StCore/StWinHandles.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __APPLE__

sview-15_10.tar.gz/StCore/StWinHandles.h -> sview-15_11.tar.gz/StCore/StWinHandles.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StWinHandles_h_

sview-15_10.tar.gz/StCore/StWindow.cpp -> sview-15_11.tar.gz/StCore/StWindow.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include <StGLCore/StGLCore11Fwd.h>

sview-15_10.tar.gz/StCore/StWindowImpl.cpp -> sview-15_11.tar.gz/StCore/StWindowImpl.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StWindowImpl.h"
@@ -410,19 +401,39 @@
 case StWinAttr_SplitCfg:
 if(attribs.Split != (StWinSplit )anIter[1]
 && attribs.IsFullScreen) {
- if(attribs.Split == StWinSlave_splitHorizontal) {
- myRectFull.right() += myRectFull.width();
- } else if(attribs.Split == StWinSlave_splitVertical) {
- myRectFull.bottom() += myRectFull.height();
+ switch(attribs.Split) {
+ case StWinSlave_splitHorizontal: myRectFull.right() += myRectFull.width(); break;
+ case StWinSlave_splitVertical: myRectFull.bottom() += myRectFull.height(); break;
+ case StWinSlave_splitVertHdmi720: myRectFull.bottom() += 720 + 30; break;
+ case StWinSlave_splitVertHdmi1080: myRectFull.bottom() += 1080 + 45; break;
+ default: break;
 }
- if((StWinSplit )anIter[1] == StWinSlave_splitHorizontal) {
- myTiledCfg = TiledCfg_MasterSlaveX;
- myRectFull.right() -= myRectFull.width() / 2;
- } else if((StWinSplit )anIter[1] == StWinSlave_splitVertical) {
- myTiledCfg = TiledCfg_MasterSlaveY;
- myRectFull.bottom() -= myRectFull.height() / 2;
- } else {
- myTiledCfg = TiledCfg_Separate;
+
+ switch((StWinSplit )anIter[1]) {
+ case StWinSlave_splitHorizontal: {
+ myTiledCfg = TiledCfg_MasterSlaveX;
+ myRectFull.right() -= myRectFull.width() / 2;
+ break;
+ }
+ case StWinSlave_splitVertical: {
+ myTiledCfg = TiledCfg_MasterSlaveY;
+ myRectFull.bottom() -= myRectFull.height() / 2;
+ break;
+ }
+ case StWinSlave_splitVertHdmi720: {
+ myTiledCfg = TiledCfg_VertHdmi720;
+ myRectFull.bottom() -= (720 + 30);
+ break;
+ }
+ case StWinSlave_splitVertHdmi1080: {
+ myTiledCfg = TiledCfg_VertHdmi1080;
+ myRectFull.bottom() -= (1080 + 45);
+ break;
+ }
+ default: {
+ myTiledCfg = TiledCfg_Separate;
+ break;
+ }
 }
 myStEventAux.Type = stEvent_Size;
 myStEventAux.Size.Time = getEventTime();
@@ -832,6 +843,11 @@
 theRect.top() -= theRect.height();
 return;
 }
+ case TiledCfg_VertHdmi720:
+ case TiledCfg_VertHdmi1080: {
+ // should not be used in this context
+ return;
+ }
 case TiledCfg_Separate:
 default: {
 return;
@@ -852,6 +868,8 @@
 }
 case TiledCfg_MasterSlaveX:
 case TiledCfg_MasterSlaveY:
+ case TiledCfg_VertHdmi720:
+ case TiledCfg_VertHdmi1080:
 case TiledCfg_Separate:
 default: {
 return;
@@ -892,6 +910,24 @@
 convertRectToBacking(aRect, ST_WIN_MASTER);
 return aRect;
 }
+ case TiledCfg_VertHdmi720: {
+ if(theWinId == ST_WIN_MASTER) {
+ aRect.y() += 720 + 30;
+ } else if(theWinId == ST_WIN_ALL) {
+ aRect.height() += 720 + 30;
+ }
+ convertRectToBacking(aRect, ST_WIN_MASTER);
+ return aRect;
+ }
+ case TiledCfg_VertHdmi1080: {
+ if(theWinId == ST_WIN_MASTER) {
+ aRect.y() += 1080 + 45;
+ } else if(theWinId == ST_WIN_ALL) {
+ aRect.height() += 1080 + 45;
+ }
+ convertRectToBacking(aRect, ST_WIN_MASTER);
+ return aRect;
+ }
 case TiledCfg_SlaveMasterY: {
 if(theWinId == ST_WIN_SLAVE) {
 aRect.y() += aHeight;

sview-15_10.tar.gz/StCore/StWindowImpl.h -> sview-15_11.tar.gz/StCore/StWindowImpl.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StWindowImpl_h_
@@ -167,6 +158,8 @@
 TiledCfg_SlaveMasterX, //!< Master at right / Slave at left
 TiledCfg_MasterSlaveY, //!< Master at top / Slave at bottom
 TiledCfg_SlaveMasterY, //!< Master at bottom / Slave at top
+ TiledCfg_VertHdmi720,
+ TiledCfg_VertHdmi1080,
 };
 
 ST_LOCAL void getTiledWinRect(StRectI_t& theRect) const;

sview-15_10.tar.gz/StCore/StWindowImplAnd.cpp -> sview-15_11.tar.gz/StCore/StWindowImplAnd.cpp Changed

@@ -1,30 +1,23 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if defined(__ANDROID__)
 
 #include "StWindowImpl.h"
+#include "stvkeysandroid.h" // Android NDK keys to VKEYs lookup array
 
 #include <StCore/StAndroidGlue.h>
 #include <StStrings/StLogger.h>
 #include <StGL/StGLContext.h>
 
 #include <cmath>
+#include <vector>
 
 void StWindowImpl::convertRectToBacking(StGLBoxPx& ,
 const int ) const {
@@ -147,6 +140,25 @@
 const int anEventType = AInputEvent_getType(theEvent);
 switch(anEventType) {
 case AINPUT_EVENT_TYPE_KEY: {
+ StVirtKey aVKeySt = ST_VK_NULL;
+ int32_t aKeySym = AKeyEvent_getKeyCode(theEvent);
+ if(aKeySym < ST_ANDROID2ST_VK_SIZE) {
+ aVKeySt = (StVirtKey )ST_ANDROID2ST_VK[aKeySym];
+ }
+ if(aVKeySt == ST_VK_NULL) {
+ return;
+ }
+
+ myStEvent.Key.Time = getEventTime(); //AKeyEvent_getEventTime(theEvent);
+ myStEvent.Key.VKey = aVKeySt;
+ myStEvent.Key.Char = 0;
+
+ const int32_t aKeyAction = AKeyEvent_getAction(theEvent);
+ if(aKeyAction == AKEY_EVENT_ACTION_DOWN) {
+ postKeyDown(myStEvent);
+ } else if(aKeyAction == AKEY_EVENT_ACTION_UP) {
+ postKeyUp(myStEvent);
+ }// else if(aKeyAction == AKEY_EVENT_ACTION_MULTIPLE) {}
 return;
 }
 case AINPUT_EVENT_TYPE_MOTION: {
@@ -327,7 +339,7 @@
 return;
 }
 case StAndroidGlue::CommandId_FocusLost: {
- //
+ myKeysState.reset();
 return;
 }
 case StAndroidGlue::CommandId_ConfigChanged: {
@@ -365,9 +377,12 @@
 myParentWin->setTrackOrientation(myToTrackOrient);
 myParentWin->fetchState(aDndFile, myQuaternion);
 if(!aDndFile.isEmpty()) {
+ std::vector<const char*> aDndList;
+ aDndList.push_back(aDndFile.toCString());
 myStEvent.Type = stEvent_FileDrop;
 myStEvent.DNDrop.Time = getEventTime();
- myStEvent.DNDrop.File = aDndFile.toCString();
+ myStEvent.DNDrop.NbFiles = aDndList.size();
+ myStEvent.DNDrop.Files = &aDndList[0];
 myEventsBuffer.append(myStEvent);
 }

sview-15_10.tar.gz/StCore/StWindowImplLin.cpp -> sview-15_11.tar.gz/StCore/StWindowImplLin.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if defined(__linux__) && !defined(__ANDROID__)
@@ -29,6 +20,7 @@
 #include <X11/xpm.h>
 
 #include <cmath>
+#include <vector>
 
 #include "../share/sView/icons/menu.xpm"
 
@@ -622,7 +614,10 @@
 Property aProperty = aDisplay->readProperty(aSrcWin, aDisplay->xDNDTypeList);
 Atom* anAtomList = (Atom* )aProperty.data;
 for(int anIter = 0; anIter < aProperty.nitems; ++anIter) {
- if(anAtomList[anIter] == aDisplay->xDNDPlainText) {
+ if(anAtomList[anIter] == aDisplay->xDNDUriList) {
+ myMaster.xDNDRequestType = aDisplay->xDNDUriList;
+ break;
+ } else if(anAtomList[anIter] == aDisplay->xDNDPlainText) {
 myMaster.xDNDRequestType = aDisplay->xDNDPlainText;
 break;
 }
@@ -678,13 +673,6 @@
 const StXDisplayH& aDisplay = myMaster.stXDisplay;
 // myMaster.hWindow or myMaster.hWindowGl
 Window aWinReciever = ((XClientMessageEvent* )&myXEvent)->window;
- /*ST_DEBUG_LOG(
- "A selection notify has arrived!\n"
- + "Requestor = 0x" + (int )myXEvent.xselectionrequest.requestor + "\n"
- + "Selection atom = " + myMaster.getAtomName(myXEvent.xselection.selection) + "\n"
- + "Target atom = " + myMaster.getAtomName(aTarget) + "\n"
- + "Property atom = " + myMaster.getAtomName(myXEvent.xselection.property) + "\n"
- );*/
 if(myXEvent.xselection.property == None) {
 return;
 } else {
@@ -694,32 +682,50 @@
 if(aTarget == aDisplay->XA_TARGETS) {
 XConvertSelection(aDisplay->hDisplay, aSelection, XA_STRING, aSelection, aWinReciever, CurrentTime);
 } else if(aTarget == myMaster.xDNDRequestType) {
- StString aData = StString((char* )aProperty.data);
+ std::vector<StString> aPaths;
+ const char* aCharFrom = (const char* )aProperty.data;
+ size_t aCharFromIndex = 0;
+ for(StUtf8Iter aCharIter(aCharFrom);; ++aCharIter) {
+ // cut filenames separated with CR/LF
+ if(*aCharIter == 0
+ || *aCharIter == stUtf32_t('\n')
+ || *aCharIter == stUtf32_t(13)) {
+ size_t aLen = aCharIter.getIndex() - aCharFromIndex;
+ if(stAreEqual(aCharFrom, "file://", 7)) {
+ aCharFrom += 7;
+ aLen -= 7;
+ }
 
- size_t anEndChar = aData.getLength();
- for(StUtf8Iter anIter = aData.iterator(); *anIter != 0; ++anIter) {
- // cut only first filename, separated with CR/LF
- if(*anIter == stUtf32_t('\n') || *anIter == stUtf32_t(13)) {
- anEndChar = anIter.getIndex();
- break;
+ StString aData(aCharFrom, aLen);
+ StString aFile;
+ if(myMaster.xDNDRequestType != XA_STRING) {
+ aFile.fromUrl(aData);
+ } else {
+ aFile = aData;
+ }
+ if(!aFile.isEmpty()) {
+ aPaths.push_back(aFile);
+ }
+
+ aCharFromIndex = aCharIter.getIndex() + 1;
+ aCharFrom = aCharIter.getBufferHere() + 1;
+ if(*aCharIter == 0) {
+ break;
+ }
 }
 }
 
- const StString ST_FILE_PROTOCOL("file://");
- size_t aCutFrom = aData.isStartsWith(ST_FILE_PROTOCOL) ? ST_FILE_PROTOCOL.getLength() : 0;
- aData = aData.subString(aCutFrom, anEndChar);
- StString aFile;
- if(myMaster.xDNDRequestType != XA_STRING) {
- aFile.fromUrl(aData);
- } else {
- aFile = aData;
+ std::vector<const char*> aDndList;
+ for(std::vector<StString>::const_iterator aFileIter = aPaths.begin(); aFileIter != aPaths.end(); ++aFileIter) {
+ aDndList.push_back(aFileIter->toCString());
+ }
+ if(!aDndList.empty()) {
+ myStEvent.Type = stEvent_FileDrop;
+ myStEvent.DNDrop.Time = getEventTime(myXEvent.xselection.time);
+ myStEvent.DNDrop.NbFiles = aDndList.size();
+ myStEvent.DNDrop.Files = &aDndList[0];
+ signals.onFileDrop->emit(myStEvent.DNDrop);
 }
- myStEvent.Type = stEvent_FileDrop;
- myStEvent.DNDrop.Time = getEventTime(myXEvent.xselection.time);
- myStEvent.DNDrop.File = aFile.toCString();
- signals.onFileDrop->emit(myStEvent.DNDrop);
-
- //ST_DEBUG_LOG(data);
 
 // Reply OK
 XClientMessageEvent aMsg;

sview-15_10.tar.gz/StCore/StWindowImplMac.mm -> sview-15_11.tar.gz/StCore/StWindowImplMac.mm Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))

sview-15_10.tar.gz/StCore/StWindowImplWin.cpp -> sview-15_11.tar.gz/StCore/StWindowImplWin.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifdef _WIN32
@@ -26,6 +17,7 @@
 #include <StGL/StGLContext.h>
 
 #include <cmath>
+#include <vector>
 
 static SV_THREAD_FUNCTION threadCreateWindows(void* inStWin);
 
@@ -492,16 +484,26 @@
 break;
 }
 
+ // convert to UTF-8
+ std::vector<StString> aPaths;
 for(UINT aFileId = 0; aFileId < aFilesCount; ++aFileId) {
 if(DragQueryFileW(aDrops, aFileId, aFileBuff, MAX_PATH) > 0) {
- const StString aFile(aFileBuff);
- myStEvent.Type = stEvent_FileDrop;
- myStEvent.DNDrop.Time = getEventTime(myEvent.time);
- myStEvent.DNDrop.File = aFile.toCString();
- myEventsBuffer.append(myStEvent);
+ aPaths.push_back(StString(aFileBuff));
 }
 }
- DragFinish(aDrops); // do not forget
+ DragFinish(aDrops);
+
+ std::vector<const char*> aDndList;
+ for(std::vector<StString>::const_iterator aFileIter = aPaths.begin(); aFileIter != aPaths.end(); ++aFileIter) {
+ aDndList.push_back(aFileIter->toCString());
+ }
+ if(!aDndList.empty()) {
+ myStEvent.Type = stEvent_FileDrop;
+ myStEvent.DNDrop.Time = getEventTime(myEvent.time);
+ myStEvent.DNDrop.NbFiles = (uint32_t )aDndList.size();
+ myStEvent.DNDrop.Files = &aDndList[0];
+ myEventsBuffer.append(myStEvent);
+ }
 break;
 }
 case WM_MOVE: {

sview-15_10.tar.gz/StCore/StXDisplay.cpp -> sview-15_11.tar.gz/StCore/StXDisplay.cpp Changed

@@ -1,19 +1,10 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
+ * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if defined(__linux__) && !defined(__ANDROID__)
@@ -39,6 +30,7 @@
 xDNDSelection(None),
 xDNDProxy(None),
 xDNDAware(None),
+ xDNDUriList(None),
 xDNDPlainText(None),
 xDNDPrimary(None),
 XA_TARGETS(None),
@@ -122,6 +114,7 @@
 xDNDSelection = XInternAtom(hDisplay, "XdndSelection", False);
 xDNDProxy = XInternAtom(hDisplay, "XdndProxy", False);
 xDNDAware = XInternAtom(hDisplay, "XdndAware", False);
+ xDNDUriList = XInternAtom(hDisplay, "text/uri-list", False);
 xDNDPlainText = XInternAtom(hDisplay, "text/plain", False);
 xDNDPrimary = XInternAtom(hDisplay, "PRIMARY", False);
 // This is a meta-format for data to be "pasted" in to.

sview-15_10.tar.gz/StCore/StXDisplay.h -> sview-15_11.tar.gz/StCore/StXDisplay.h Changed

@@ -1,19 +1,10 @@
 /**
- * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
+ * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StXDisplay_h_
@@ -61,6 +52,7 @@
 Atom xDNDSelection;
 Atom xDNDProxy;
 Atom xDNDAware;
+ Atom xDNDUriList;
 Atom xDNDPlainText;
 Atom xDNDPrimary;

sview-15_11.tar.gz/StCore/stvkeysandroid.h Added

@@ -0,0 +1,282 @@
+/**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
+ * Copyright © 2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#if (defined(__ANDROID__))
+
+#ifndef __stVKEYS_ANDROID_H_
+#define __stVKEYS_ANDROID_H_
+
+#include <StCore/StVirtualKeys.h>
+
+/**
+ * This is lookup array to convert Android NDK key codes to ST_VKEY codes.
+ * Notice, this array useless for text input!
+ */
+#define ST_ANDROID2ST_VK_SIZE 256
+static const unsigned int ST_ANDROID2ST_VK[ST_ANDROID2ST_VK_SIZE] = {
+ 0, // AKEYCODE_UNKNOWN = 0,
+ 0, // AKEYCODE_SOFT_LEFT = 1,
+ 0, // AKEYCODE_SOFT_RIGHT = 2,
+ 0, // AKEYCODE_HOME = 3,
+ 0, // AKEYCODE_BACK = 4,
+ 0, // AKEYCODE_CALL = 5,
+ 0, // AKEYCODE_ENDCALL = 6,
+ ST_VK_0, // AKEYCODE_0 = 7,
+ ST_VK_1, // AKEYCODE_1 = 8,
+ ST_VK_2, // AKEYCODE_2 = 9,
+ ST_VK_3, // AKEYCODE_3 = 10,
+ ST_VK_4, // AKEYCODE_4 = 11,
+ ST_VK_5, // AKEYCODE_5 = 12,
+ ST_VK_6, // AKEYCODE_6 = 13,
+ ST_VK_7, // AKEYCODE_7 = 14,
+ ST_VK_8, // AKEYCODE_8 = 15,
+ ST_VK_9, // AKEYCODE_9 = 16,
+ 0, // AKEYCODE_STAR = 17,
+ 0, // AKEYCODE_POUND = 18,
+ ST_VK_UP, // AKEYCODE_DPAD_UP = 19,
+ ST_VK_DOWN, // AKEYCODE_DPAD_DOWN = 20,
+ ST_VK_LEFT, // AKEYCODE_DPAD_LEFT = 21,
+ ST_VK_RIGHT, // AKEYCODE_DPAD_RIGHT = 22,
+ 0, // AKEYCODE_DPAD_CENTER = 23,
+ ST_VK_VOLUME_UP, // AKEYCODE_VOLUME_UP = 24,
+ ST_VK_VOLUME_DOWN, // AKEYCODE_VOLUME_DOWN = 25,
+ 0, // AKEYCODE_POWER = 26,
+ 0, // AKEYCODE_CAMERA = 27,
+ 0, // AKEYCODE_CLEAR = 28,
+ ST_VK_A, // AKEYCODE_A = 29,
+ ST_VK_B, // AKEYCODE_B = 30,
+ ST_VK_C, // AKEYCODE_C = 31,
+ ST_VK_D, // AKEYCODE_D = 32,
+ ST_VK_E, // AKEYCODE_E = 33,
+ ST_VK_F, // AKEYCODE_F = 34,
+ ST_VK_G, // AKEYCODE_G = 35,
+ ST_VK_H, // AKEYCODE_H = 36,
+ ST_VK_I, // AKEYCODE_I = 37,
+ ST_VK_J, // AKEYCODE_J = 38,
+ ST_VK_K, // AKEYCODE_K = 39,
+ ST_VK_L, // AKEYCODE_L = 40,
+ ST_VK_M, // AKEYCODE_M = 41,
+ ST_VK_N, // AKEYCODE_N = 42,
+ ST_VK_O, // AKEYCODE_O = 43,
+ ST_VK_P, // AKEYCODE_P = 44,
+ ST_VK_Q, // AKEYCODE_Q = 45,
+ ST_VK_R, // AKEYCODE_R = 46,
+ ST_VK_S, // AKEYCODE_S = 47,
+ ST_VK_T, // AKEYCODE_T = 48,
+ ST_VK_U, // AKEYCODE_U = 49,
+ ST_VK_V, // AKEYCODE_V = 50,
+ ST_VK_W, // AKEYCODE_W = 51,
+ ST_VK_X, // AKEYCODE_X = 52,
+ ST_VK_Y, // AKEYCODE_Y = 53,
+ ST_VK_Z, // AKEYCODE_Z = 54,
+ ST_VK_COMMA, // AKEYCODE_COMMA = 55,
+ ST_VK_PERIOD, // AKEYCODE_PERIOD = 56,
+ ST_VK_MENU, // AKEYCODE_ALT_LEFT = 57,
+ ST_VK_MENU, // AKEYCODE_ALT_RIGHT = 58,
+ ST_VK_SHIFT, // AKEYCODE_SHIFT_LEFT = 59,
+ ST_VK_SHIFT, // AKEYCODE_SHIFT_RIGHT = 60,
+ ST_VK_TAB, // AKEYCODE_TAB = 61,
+ ST_VK_SPACE, // AKEYCODE_SPACE = 62,
+ 0, // AKEYCODE_SYM = 63,
+ 0, // AKEYCODE_EXPLORER = 64,
+ 0, // AKEYCODE_ENVELOPE = 65,
+ ST_VK_RETURN, // AKEYCODE_ENTER = 66,
+ ST_VK_BACK, // AKEYCODE_DEL = 67,
+ 0, // AKEYCODE_GRAVE = 68,
+ ST_VK_OEM_MINUS, // AKEYCODE_MINUS = 69,
+ ST_VK_OEM_PLUS, // AKEYCODE_EQUALS = 70,
+ ST_VK_BRACKETLEFT, // AKEYCODE_LEFT_BRACKET = 71,
+ ST_VK_BRACKETRIGHT, // AKEYCODE_RIGHT_BRACKET = 72,
+ ST_VK_BACKSLASH, // AKEYCODE_BACKSLASH = 73,
+ ST_VK_SEMICOLON, // AKEYCODE_SEMICOLON = 74,
+ ST_VK_APOSTROPHE, // AKEYCODE_APOSTROPHE = 75,
+ ST_VK_SLASH, // AKEYCODE_SLASH = 76,
+ 0, // AKEYCODE_AT = 77,
+ 0, // AKEYCODE_NUM = 78,
+ 0, // AKEYCODE_HEADSETHOOK = 79,
+ 0, // AKEYCODE_FOCUS = 80, // *Camera* focus
+ 0, // AKEYCODE_PLUS = 81,
+ 0, // AKEYCODE_MENU = 82,
+ 0, // AKEYCODE_NOTIFICATION = 83,
+ 0, // AKEYCODE_SEARCH = 84,
+ ST_VK_MEDIA_PLAY_PAUSE, // AKEYCODE_MEDIA_PLAY_PAUSE= 85,
+ ST_VK_MEDIA_STOP, // AKEYCODE_MEDIA_STOP = 86,
+ ST_VK_MEDIA_NEXT_TRACK, // AKEYCODE_MEDIA_NEXT = 87,
+ ST_VK_MEDIA_PREV_TRACK, // AKEYCODE_MEDIA_PREVIOUS = 88,
+ 0, // AKEYCODE_MEDIA_REWIND = 89,
+ 0, // AKEYCODE_MEDIA_FAST_FORWARD = 90,
+ ST_VK_VOLUME_MUTE, // AKEYCODE_MUTE = 91,
+ ST_VK_PAGE_UP, // AKEYCODE_PAGE_UP = 92,
+ ST_VK_PAGE_DOWN, // AKEYCODE_PAGE_DOWN = 93,
+ 0, // AKEYCODE_PICTSYMBOLS = 94,
+ 0, // AKEYCODE_SWITCH_CHARSET = 95,
+ 0, // AKEYCODE_BUTTON_A = 96,
+ 0, // AKEYCODE_BUTTON_B = 97,
+ 0, // AKEYCODE_BUTTON_C = 98,
+ 0, // AKEYCODE_BUTTON_X = 99,
+ 0, // AKEYCODE_BUTTON_Y = 100,
+ 0, // AKEYCODE_BUTTON_Z = 101,
+ 0, // AKEYCODE_BUTTON_L1 = 102,
+ 0, // AKEYCODE_BUTTON_R1 = 103,
+ 0, // AKEYCODE_BUTTON_L2 = 104,
+ 0, // AKEYCODE_BUTTON_R2 = 105,
+ 0, // AKEYCODE_BUTTON_THUMBL = 106,
+ 0, // AKEYCODE_BUTTON_THUMBR = 107,
+ 0, // AKEYCODE_BUTTON_START = 108,
+ 0, // AKEYCODE_BUTTON_SELECT = 109,
+ 0, // AKEYCODE_BUTTON_MODE = 110,
+ ST_VK_ESCAPE, // AKEYCODE_ESCAPE = 111,
+ ST_VK_DELETE, // AKEYCODE_FORWARD_DEL = 112,
+ ST_VK_CONTROL, // AKEYCODE_CTRL_LEFT = 113,
+ ST_VK_CONTROL, // AKEYCODE_CTRL_RIGHT = 114,
+ ST_VK_CAPITAL, // AKEYCODE_CAPS_LOCK = 115,
+ ST_VK_SCROLL, // AKEYCODE_SCROLL_LOCK = 116,
+ 0, // AKEYCODE_META_LEFT = 117,
+ 0, // AKEYCODE_META_RIGHT = 118,
+ 0, // AKEYCODE_FUNCTION = 119,
+ 0, // AKEYCODE_SYSRQ = 120,
+ 0, // AKEYCODE_BREAK = 121,
+ ST_VK_HOME, // AKEYCODE_MOVE_HOME = 122,
+ ST_VK_END, // AKEYCODE_MOVE_END = 123,
+ ST_VK_INSERT, // AKEYCODE_INSERT = 124,
+ 0, // AKEYCODE_FORWARD = 125,
+ ST_VK_MEDIA_PLAY_PAUSE, // AKEYCODE_MEDIA_PLAY = 126,
+ ST_VK_MEDIA_PLAY_PAUSE, // AKEYCODE_MEDIA_PAUSE = 127,
+ 0, // AKEYCODE_MEDIA_CLOSE = 128,
+ 0, // AKEYCODE_MEDIA_EJECT = 129,
+ 0, // AKEYCODE_MEDIA_RECORD = 130,
+ ST_VK_F1, // AKEYCODE_F1 = 131,
+ ST_VK_F2, // AKEYCODE_F2 = 132,
+ ST_VK_F3, // AKEYCODE_F3 = 133,
+ ST_VK_F4, // AKEYCODE_F4 = 134,
+ ST_VK_F5, // AKEYCODE_F5 = 135,
+ ST_VK_F6, // AKEYCODE_F6 = 136,
+ ST_VK_F7, // AKEYCODE_F7 = 137,
+ ST_VK_F8, // AKEYCODE_F8 = 138,
+ ST_VK_F9, // AKEYCODE_F9 = 139,
+ ST_VK_F10, // AKEYCODE_F10 = 140,
+ ST_VK_F11, // AKEYCODE_F11 = 141,
+ ST_VK_F12, // AKEYCODE_F12 = 142,
+ 0, // AKEYCODE_NUM_LOCK = 143,
+ ST_VK_NUMPAD0, // AKEYCODE_NUMPAD_0 = 144,
+ ST_VK_NUMPAD1, // AKEYCODE_NUMPAD_1 = 145,
+ ST_VK_NUMPAD2, // AKEYCODE_NUMPAD_2 = 146,
+ ST_VK_NUMPAD3, // AKEYCODE_NUMPAD_3 = 147,
+ ST_VK_NUMPAD4, // AKEYCODE_NUMPAD_4 = 148,
+ ST_VK_NUMPAD5, // AKEYCODE_NUMPAD_5 = 149,
+ ST_VK_NUMPAD6, // AKEYCODE_NUMPAD_6 = 150,
+ ST_VK_NUMPAD7, // AKEYCODE_NUMPAD_7 = 151,
+ ST_VK_NUMPAD8, // AKEYCODE_NUMPAD_8 = 152,
+ ST_VK_NUMPAD9, // AKEYCODE_NUMPAD_9 = 153,
+ ST_VK_DIVIDE, // AKEYCODE_NUMPAD_DIVIDE = 154,
+ ST_VK_MULTIPLY, // AKEYCODE_NUMPAD_MULTIPLY = 155,
+ ST_VK_SUBTRACT, // AKEYCODE_NUMPAD_SUBTRACT = 156,
+ ST_VK_ADD, // AKEYCODE_NUMPAD_ADD = 157,
+ ST_VK_DECIMAL, // AKEYCODE_NUMPAD_DOT = 158,
+ ST_VK_SEPARATOR, // AKEYCODE_NUMPAD_COMMA = 159,
+ ST_VK_RETURN, // AKEYCODE_NUMPAD_ENTER = 160,
+ 0, // AKEYCODE_NUMPAD_EQUALS = 161,
+ 0, // AKEYCODE_NUMPAD_LEFT_PAREN = 162,
+ 0, // AKEYCODE_NUMPAD_RIGHT_PAREN = 163,
+ ST_VK_VOLUME_MUTE, // AKEYCODE_VOLUME_MUTE = 164,
+ 0, // AKEYCODE_INFO = 165,
+ 0, // AKEYCODE_CHANNEL_UP = 166,
+ 0, // AKEYCODE_CHANNEL_DOWN = 167,
+ 0, // AKEYCODE_ZOOM_IN = 168,
+ 0, // AKEYCODE_ZOOM_OUT = 169,
+ 0, // AKEYCODE_TV = 170,
+ 0, // AKEYCODE_WINDOW = 171,
+ 0, // AKEYCODE_GUIDE = 172,
+ 0, // AKEYCODE_DVR = 173,
+ 0, // AKEYCODE_BOOKMARK = 174,
+ 0, // AKEYCODE_CAPTIONS = 175,
+ 0, // AKEYCODE_SETTINGS = 176,
+ 0, // AKEYCODE_TV_POWER = 177,
+ 0, // AKEYCODE_TV_INPUT = 178,
+ 0, // AKEYCODE_STB_POWER = 179,
+ 0, // AKEYCODE_STB_INPUT = 180,
+ 0, // AKEYCODE_AVR_POWER = 181,
+ 0, // AKEYCODE_AVR_INPUT = 182,
+ 0, // AKEYCODE_PROG_RED = 183,
+ 0, // AKEYCODE_PROG_GREEN = 184,
+ 0, // AKEYCODE_PROG_YELLOW = 185,
+ 0, // AKEYCODE_PROG_BLUE = 186,
+ 0, // AKEYCODE_APP_SWITCH = 187,
+ 0, // AKEYCODE_BUTTON_1 = 188,
+ 0, // AKEYCODE_BUTTON_2 = 189,
+ 0, // AKEYCODE_BUTTON_3 = 190,
+ 0, // AKEYCODE_BUTTON_4 = 191,
+ 0, // AKEYCODE_BUTTON_5 = 192,
+ 0, // AKEYCODE_BUTTON_6 = 193,
+ 0, // AKEYCODE_BUTTON_7 = 194,
+ 0, // AKEYCODE_BUTTON_8 = 195,
+ 0, // AKEYCODE_BUTTON_9 = 196,
+ 0, // AKEYCODE_BUTTON_10 = 197,
+ 0, // AKEYCODE_BUTTON_11 = 198,
+ 0, // AKEYCODE_BUTTON_12 = 199,
+ 0, // AKEYCODE_BUTTON_13 = 200,
+ 0, // AKEYCODE_BUTTON_14 = 201,
+ 0, // AKEYCODE_BUTTON_15 = 202,
+ 0, // AKEYCODE_BUTTON_16 = 203,
+ 0, // AKEYCODE_LANGUAGE_SWITCH = 204,
+ 0, // AKEYCODE_MANNER_MODE = 205,
+ 0, /// AKEYCODE_3D_MODE = 206,
+ 0, // AKEYCODE_CONTACTS = 207,
+ 0, // AKEYCODE_CALENDAR = 208,
+ 0, // AKEYCODE_MUSIC = 209,
+ 0, // AKEYCODE_CALCULATOR = 210,
+ 0, // 211
+ 0, // 212
+ 0, // 213
+ 0, // 214
+ 0, // 215
+ 0, // 216
+ 0, // 217
+ 0, // 218
+ 0, // 219
+ 0, // 220
+ 0, // 221
+ 0, // 222
+ 0, // 223
+ 0, // 224
+ 0, // 225
+ 0, // 226
+ 0, // 227
+ 0, // 228
+ 0, // 229
+ 0, // 230
+ 0, // 231
+ 0, // 232
+ 0, // 233
+ 0, // 234
+ 0, // 235
+ 0, // 236
+ 0, // 237
+ 0, // 238
+ 0, // 239
+ 0, // 240
+ 0, // 241
+ 0, // 242
+ 0, // 243
+ 0, // 244
+ 0, // 245
+ 0, // 246
+ 0, // 247
+ 0, // 248
+ 0, // 249
+ 0, // 250
+ 0, // 251
+ 0, // 252
+ 0, // 253
+ 0, // 254
+ 0 // 255
+};
+
+#endif // __stVKEYS_ANDROID_H_
+#endif // __ANDROID__

sview-15_10.tar.gz/StCore/stvkeyscarbon.h -> sview-15_11.tar.gz/StCore/stvkeyscarbon.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2011-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))

sview-15_10.tar.gz/StCore/stvkeysxarray.h -> sview-15_11.tar.gz/StCore/stvkeysxarray.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __stVKEYS_XARRAY_H_

sview-15_10.tar.gz/StDiagnostics/StDiagnostics.cbp -> sview-15_11.tar.gz/StDiagnostics/StDiagnostics.cbp Changed

@@ -6,36 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStDiagnostics" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Comdlg32" />
-					<Add library="shell32" />
-					<Add library="Wsock32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StDiagnostics" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -68,11 +38,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StDiagnostics" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -273,9 +243,8 @@
 		<Unit filename="StDiagnostics.h" />
 		<Unit filename="StDiagnostics.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StDiagnosticsGUI.cpp" />

sview-15_10.tar.gz/StGLWidgets/StGLAssignHotKey.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLAssignHotKey.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLButton.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLButton.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLCheckbox.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLCheckbox.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLCheckboxTextured.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLCheckboxTextured.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLCombobox.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLCombobox.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLDescription.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLDescription.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLFpsLabel.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLFpsLabel.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLImageProgram.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLImageProgram.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLImageRegion.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLImageRegion.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLMenu.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMenu.cpp Changed

@@ -1,4 +1,5 @@
 /**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
@@ -16,6 +17,7 @@
 #include <StGL/StGLContext.h>
 #include <StGLCore/StGLCore20.h>
 
+#include <StCore/StEvent.h>
 #include <StSlots/StAction.h>
 
 void StGLMenu::DeleteWithSubMenus(StGLMenu* theMenu) {
@@ -72,6 +74,11 @@
 }
 }
 
+void StGLMenu::setContextual(const bool theValue) {
+ myIsContextual = theValue;
+ myIsTopWidget = theValue;
+}
+
 void StGLMenu::stglResize() {
 // Since all children should be StGLMenuItem implementing delayed resize,
 // just postpone resize until items will be actually rendered.
@@ -204,6 +211,17 @@
 StGLWidget::stglDraw(theView);
 }
 
+bool StGLMenu::doKeyDown(const StKeyEvent& theEvent) {
+ switch(theEvent.VKey) {
+ case ST_VK_ESCAPE: {
+ destroyWithDelay(this);
+ return true;
+ }
+ default:
+ return false;
+ }
+}
+
 bool StGLMenu::tryUnClick(const StPointD_t& theCursorZo,
 const int& theMouseBtn,
 bool& theIsItemUnclicked) {

sview-15_10.tar.gz/StGLWidgets/StGLMenuCheckbox.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMenuCheckbox.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLMenuItem.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMenuItem.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLMenuProgram.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMenuProgram.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLMenuRadioButton.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMenuRadioButton.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLMessageBox.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMessageBox.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLMsgStack.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLMsgStack.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLOpenFile.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLOpenFile.cpp Changed

@@ -1,4 +1,5 @@
 /**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
 * Copyright © 2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
@@ -124,7 +125,8 @@
 aName = theTarget;
 }
 if(aName.isEmpty()
- || theTarget.isEmpty()) {
+ || theTarget.isEmpty()
+ || !StFileNode::isFileExists(theTarget)) {
 return;
 }
 myHotPaths.add(theTarget);
@@ -182,9 +184,9 @@
 
 myFolder = new StFolder(theFolder);
 myFolder->init(myExtensions, 1, true);
- myCurrentPath->setText(StString("Location:*") + myFolder->getPath() + ST_FILE_SPLITTER);
+ StString aPath = myFolder->getPath();
+ myCurrentPath->setText(StString("Location:*") + aPath + (!aPath.isEmpty() ? ST_FILE_SPLITTER : ""));
 
- StString aPath = myFolder->getPath() + "";
 StString aPathUp = StFileNode::getFolderUp(aPath);
 if(!aPathUp.isEmpty()) {
 StGLMenuItem* anUpItem = new StGLPassiveMenuItem(myList);

sview-15_10.tar.gz/StGLWidgets/StGLPlayList.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLPlayList.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLRadioButton.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLRadioButton.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLRadioButtonFloat32.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLRadioButtonFloat32.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLRadioButtonTextured.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLRadioButtonTextured.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLRangeFieldFloat32.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLRangeFieldFloat32.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLRootWidget.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLRootWidget.cpp Changed

@@ -1,4 +1,5 @@
 /**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
@@ -9,6 +10,8 @@
 #include <StGLWidgets/StGLRootWidget.h>
 
 #include <StGLWidgets/StGLMenuProgram.h>
+#include <StGLWidgets/StGLTextProgram.h>
+#include <StGLWidgets/StGLTextBorderProgram.h>
 
 #include <StGL/StGLContext.h>
 #include <StGLCore/StGLCore20.h>
@@ -49,6 +52,8 @@
 myLensDist(0.0f),
 myScrDispXPx(0),
 myMenuProgram(new StGLMenuProgram()),
+ myTextProgram(new StGLTextProgram()),
+ myTextBorderProgram(new StGLTextBorderProgram()),
 myIsMobile(false),
 myScaleGlX(1.0),
 myScaleGlY(1.0),
@@ -97,6 +102,10 @@
 if(!myGlCtx.isNull()) {
 myMenuProgram->release(*myGlCtx);
 myMenuProgram.nullify();
+ myTextProgram->release(*myGlCtx);
+ myTextProgram.nullify();
+ myTextBorderProgram->release(*myGlCtx);
+ myTextBorderProgram.nullify();
 if(!myCheckboxIcon.isNull()) {
 for(size_t aTexIter = 0; aTexIter < myCheckboxIcon->size(); ++aTexIter) {
 myCheckboxIcon->changeValue(aTexIter).release(*myGlCtx);
@@ -228,6 +237,12 @@
 if(!myMenuProgram->isValid()
 && !myMenuProgram->init(*myGlCtx)) {
 return false;
+ } else if(!myTextProgram->isValid()
+ && !myTextProgram->init(*myGlCtx)) {
+ return false;
+ } else if(!myTextBorderProgram->isValid()
+ && !myTextBorderProgram->init(*myGlCtx)) {
+ return false;
 }
 
 return StGLWidget::stglInit();
@@ -253,6 +268,17 @@
 break;
 }
 
+ if(myTextProgram->isValid()) {
+ myTextProgram->use(*myGlCtx);
+ myTextProgram->setProjMat(*myGlCtx, myProjCamera.getProjMatrix());
+ myTextProgram->unuse(*myGlCtx);
+ }
+ if(myTextBorderProgram->isValid()) {
+ myTextBorderProgram->use(*myGlCtx);
+ myTextBorderProgram->setProjMat(*myGlCtx, myProjCamera.getProjMatrix());
+ myTextBorderProgram->unuse(*myGlCtx);
+ }
+
 StGLWidget::stglDraw(theView);
 }

sview-15_10.tar.gz/StGLWidgets/StGLScrollArea.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLScrollArea.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLSubtitles.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLSubtitles.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLSwitchTextured.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLSwitchTextured.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLTable.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLTable.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLTextArea.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLTextArea.cpp Changed

@@ -1,4 +1,5 @@
 /**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
@@ -7,7 +8,10 @@
 */
 
 #include <StGLWidgets/StGLTextArea.h>
+
 #include <StGLWidgets/StGLRootWidget.h>
+#include <StGLWidgets/StGLTextProgram.h>
+#include <StGLWidgets/StGLTextBorderProgram.h>
 
 #include <StGL/StGLContext.h>
 #include <StGL/StGLProgram.h>
@@ -16,205 +20,12 @@
 #include <StFile/StFileNode.h>
 #include <StThreads/StProcess.h>
 
-class StGLTextArea::StTextProgram : public StGLProgram {
-
- public:
-
- StTextProgram()
- : StGLProgram("StGLTextArea, Text Program") {
- //
- }
-
- StGLVarLocation getVVertexLoc() const {
- return atrVVertexLoc;
- }
-
- StGLVarLocation getVTexCoordLoc() const {
- return atrVTexCoordLoc;
- }
-
- void setProjMat(StGLContext& theCtx,
- const StGLMatrix& theProjMat) {
- theCtx.core20fwd->glUniformMatrix4fv(uniProjMatLoc, 1, GL_FALSE, theProjMat);
- }
-
- void setModelMat(StGLContext& theCtx,
- const StGLMatrix& theModelMat) {
- theCtx.core20fwd->glUniformMatrix4fv(uniModelMatLoc, 1, GL_FALSE, theModelMat);
- }
-
- void setTextColor(StGLContext& theCtx,
- const StGLVec4& theTextColorVec) {
- theCtx.core20fwd->glUniform4fv(uniTextColorLoc, 1, theTextColorVec);
- }
-
- virtual bool init(StGLContext& theCtx) {
- const char VERTEX_SHADER[] =
- "uniform mat4 uProjMat; \
- uniform mat4 uModelMat; \
- attribute vec4 vVertex; \
- attribute vec2 vTexCoord; \
- varying vec2 fTexCoord; \
- void main(void) { \
- fTexCoord = vTexCoord; \
- gl_Position = uProjMat * uModelMat * vVertex; \
- }";
-
- const char FRAGMENT_GET_RED[] =
- "float getAlpha(void) { return texture2D(uTexture, fTexCoord).r; }";
-
- const char FRAGMENT_GET_ALPHA[] =
- "float getAlpha(void) { return texture2D(uTexture, fTexCoord).a; }";
-
- const char FRAGMENT_SHADER[] =
- "uniform sampler2D uTexture;"
- "uniform vec4 uTextColor;"
- "varying vec2 fTexCoord;"
- "float getAlpha(void);"
- "void main(void) {"
- " vec4 color = uTextColor;"
- " color.a *= getAlpha();"
- " gl_FragColor = color;"
- "}";
-
- StGLVertexShader aVertexShader(StGLProgram::getTitle());
- aVertexShader.init(theCtx, VERTEX_SHADER);
- StGLAutoRelease aTmp1(theCtx, aVertexShader);
-
- StGLFragmentShader aFragmentShader(StGLProgram::getTitle());
- aFragmentShader.init(theCtx, FRAGMENT_SHADER,
- theCtx.arbTexRG ? FRAGMENT_GET_RED : FRAGMENT_GET_ALPHA);
- StGLAutoRelease aTmp2(theCtx, aFragmentShader);
- if(!StGLProgram::create(theCtx)
- .attachShader(theCtx, aVertexShader)
- .attachShader(theCtx, aFragmentShader)
- .link(theCtx)) {
- return false;
- }
-
- uniProjMatLoc = StGLProgram::getUniformLocation(theCtx, "uProjMat");
- uniModelMatLoc = StGLProgram::getUniformLocation(theCtx, "uModelMat");
- uniTextColorLoc = StGLProgram::getUniformLocation(theCtx, "uTextColor");
- atrVVertexLoc = StGLProgram::getAttribLocation(theCtx, "vVertex");
- atrVTexCoordLoc = StGLProgram::getAttribLocation(theCtx, "vTexCoord");
-
- StGLVarLocation uniTextureLoc = StGLProgram::getUniformLocation(theCtx, "uTexture");
- if(uniTextureLoc.isValid()) {
- StGLProgram::use(theCtx);
- theCtx.core20fwd->glUniform1i(uniTextureLoc, StGLProgram::TEXTURE_SAMPLE_0);
- StGLProgram::unuse(theCtx);
- }
-
- return uniProjMatLoc.isValid()
- && uniModelMatLoc.isValid()
- && uniTextColorLoc.isValid()
- && atrVVertexLoc.isValid()
- && atrVTexCoordLoc.isValid()
- && uniTextureLoc.isValid();
- }
-
- private:
-
- StGLVarLocation uniProjMatLoc;
- StGLVarLocation uniModelMatLoc;
- StGLVarLocation uniTextColorLoc;
-
- StGLVarLocation atrVVertexLoc;
- StGLVarLocation atrVTexCoordLoc;
-
-};
-
-class StGLTextArea::StBorderProgram : public StGLProgram {
-
- public:
-
- StBorderProgram()
- : StGLProgram("StGLTextArea, Border Program"),
- uniProjMatLoc(),
- uniModelMatLoc(),
- uniColorLoc(),
- atrVVertexLoc() {
- //
- }
-
- StGLVarLocation getVVertexLoc() const {
- return atrVVertexLoc;
- }
-
- void setProjMat(StGLContext& theCtx,
- const StGLMatrix& theProjMat) {
- theCtx.core20fwd->glUniformMatrix4fv(uniProjMatLoc, 1, GL_FALSE, theProjMat);
- }
-
- void setModelMat(StGLContext& theCtx,
- const StGLMatrix& theModelMat) {
- theCtx.core20fwd->glUniformMatrix4fv(uniModelMatLoc, 1, GL_FALSE, theModelMat);
- }
-
- void setColor(StGLContext& theCtx,
- const StGLVec4& theColorVec) {
- theCtx.core20fwd->glUniform4fv(uniColorLoc, 1, theColorVec);
- }
-
- virtual bool init(StGLContext& theCtx) {
- const char VERTEX_SHADER[] =
- "uniform mat4 uProjMat; \
- uniform mat4 uModelMat; \
- attribute vec4 vVertex; \
- void main(void) { \
- gl_Position = uProjMat * uModelMat * vVertex; \
- }";
-
- const char FRAGMENT_SHADER[] =
- "uniform vec4 uColor; \
- void main(void) { \
- gl_FragColor = uColor; \
- }";
-
- StGLVertexShader aVertexShader(StGLProgram::getTitle());
- aVertexShader.init(theCtx, VERTEX_SHADER);
- StGLAutoRelease aTmp1(theCtx, aVertexShader);
-
- StGLFragmentShader aFragmentShader(StGLProgram::getTitle());
- aFragmentShader.init(theCtx, FRAGMENT_SHADER);
- StGLAutoRelease aTmp2(theCtx, aFragmentShader);
- if(!StGLProgram::create(theCtx)
- .attachShader(theCtx, aVertexShader)
- .attachShader(theCtx, aFragmentShader)
- .link(theCtx)) {
- return false;
- }
-
- uniProjMatLoc = StGLProgram::getUniformLocation(theCtx, "uProjMat");
- uniModelMatLoc = StGLProgram::getUniformLocation(theCtx, "uModelMat");
- uniColorLoc = StGLProgram::getUniformLocation(theCtx, "uColor");
- atrVVertexLoc = StGLProgram::getAttribLocation(theCtx, "vVertex");
- return uniProjMatLoc.isValid() && uniModelMatLoc.isValid() && uniColorLoc.isValid() && atrVVertexLoc.isValid();
- }
-
- private:
-
- StGLVarLocation uniProjMatLoc;
- StGLVarLocation uniModelMatLoc;
- StGLVarLocation uniColorLoc;
-
- StGLVarLocation atrVVertexLoc;
-
-};
-
-namespace {
- static const size_t SHARE_TEXT_PROGRAM_ID = StGLRootWidget::generateShareId();
- static const size_t SHARE_BORDER_PROGRAM_ID = StGLRootWidget::generateShareId();
-}
-
 StGLTextArea::StGLTextArea(StGLWidget* theParent,
 const int theLeft, const int theTop,
 const StGLCorner theCorner,
 const int theWidth, const int theHeight,
 const FontSize theSize)
 : StGLWidget(theParent, theLeft, theTop, theCorner, theWidth, theHeight),
- myTextProgram(getRoot()->getShare(SHARE_TEXT_PROGRAM_ID)),
- myBorderProgram(getRoot()->getShare(SHARE_BORDER_PROGRAM_ID)),
 mySize(theSize),
 myTextColor(0.0f, 0.0f, 0.0f, 1.0f),
 myShadowColor(0.0f, 0.0f, 0.0f, 1.0f),
@@ -359,27 +170,6 @@
 }
 
 myTextWidth = (GLfloat )getRectPx().width();
-
- // initialize text program
- if(myTextProgram.isNull()) {
- myTextProgram.create(getRoot()->getContextHandle(), new StTextProgram());
- if(!myTextProgram->init(aCtx)) {
- return false;
- }
- } else if(!myTextProgram->isValid()) {
- return false;
- }
-
- // initialize border program
- if(myBorderProgram.isNull()) {
- myBorderProgram.create(getRoot()->getContextHandle(), new StBorderProgram());
- if(!myBorderProgram->init(aCtx)) {
- return false;
- }
- } else if(!myBorderProgram->isValid()) {
- return false;
- }
-
 myIsInitialized = true;
 
 myBorderIVertBuf.init(aCtx);
@@ -428,6 +218,7 @@
 
 void StGLTextArea::drawText(StGLContext& theCtx) {
 theCtx.core20fwd->glActiveTexture(GL_TEXTURE0);
+ StGLTextProgram& aProgram = myRoot->getTextProgram();
 for(size_t aTextureIter = 0; aTextureIter < myTexturesList.size(); ++aTextureIter) {
 if(!myTextVertBuf[aTextureIter]->isValid() || myTextVertBuf[aTextureIter]->getElemsCount() < 1) {
 continue;
@@ -435,13 +226,13 @@
 
 theCtx.core20fwd->glBindTexture(GL_TEXTURE_2D, myTexturesList[aTextureIter]);
 
- myTextVertBuf[aTextureIter]->bindVertexAttrib(theCtx, myTextProgram->getVVertexLoc());
- myTextTCrdBuf[aTextureIter]->bindVertexAttrib(theCtx, myTextProgram->getVTexCoordLoc());
+ myTextVertBuf[aTextureIter]->bindVertexAttrib(theCtx, aProgram.getVVertexLoc());
+ myTextTCrdBuf[aTextureIter]->bindVertexAttrib(theCtx, aProgram.getVTexCoordLoc());
 
 theCtx.core20fwd->glDrawArrays(GL_TRIANGLES, 0, GLsizei(myTextVertBuf[aTextureIter]->getElemsCount()));
 
- myTextTCrdBuf[aTextureIter]->unBindVertexAttrib(theCtx, myTextProgram->getVTexCoordLoc());
- myTextVertBuf[aTextureIter]->unBindVertexAttrib(theCtx, myTextProgram->getVVertexLoc());
+ myTextTCrdBuf[aTextureIter]->unBindVertexAttrib(theCtx, aProgram.getVTexCoordLoc());
+ myTextVertBuf[aTextureIter]->unBindVertexAttrib(theCtx, aProgram.getVVertexLoc());
 }
 theCtx.core20fwd->glBindTexture(GL_TEXTURE_2D, 0);
 }
@@ -484,28 +275,28 @@
 recomputeBorder(aCtx);
 }
 
- myBorderProgram->use(aCtx);
- myBorderProgram->setProjMat(aCtx, getCamera()->getProjMatrix());
- myBorderProgram->setModelMat(aCtx, aModelMat);
+ StGLTextBorderProgram& aBorderProgram = myRoot->getTextBorderProgram();
+ aBorderProgram.use(aCtx);
+ aBorderProgram.setModelMat(aCtx, aModelMat);
 
- myBorderProgram->setColor(aCtx, myBorderColor);
- myBorderOVertBuf.bindVertexAttrib(aCtx, myBorderProgram->getVVertexLoc());
+ aBorderProgram.setColor(aCtx, myBorderColor);
+ myBorderOVertBuf.bindVertexAttrib(aCtx, aBorderProgram.getVVertexLoc());
 aCtx.core20fwd->glDrawArrays(GL_TRIANGLE_STRIP, 0, GLsizei(myBorderOVertBuf.getElemsCount()));
- myBorderOVertBuf.unBindVertexAttrib(aCtx, myBorderProgram->getVVertexLoc());
+ myBorderOVertBuf.unBindVertexAttrib(aCtx, aBorderProgram.getVVertexLoc());
 
- myBorderProgram->setColor(aCtx, myBackColor);
- myBorderIVertBuf.bindVertexAttrib(aCtx, myBorderProgram->getVVertexLoc());
+ aBorderProgram.setColor(aCtx, myBackColor);
+ myBorderIVertBuf.bindVertexAttrib(aCtx, aBorderProgram.getVVertexLoc());
 aCtx.core20fwd->glDrawArrays(GL_TRIANGLE_STRIP, 0, GLsizei(myBorderIVertBuf.getElemsCount()));
- myBorderIVertBuf.unBindVertexAttrib(aCtx, myBorderProgram->getVVertexLoc());
- myBorderProgram->unuse(aCtx);
+ myBorderIVertBuf.unBindVertexAttrib(aCtx, aBorderProgram.getVVertexLoc());
+ aBorderProgram.unuse(aCtx);
 }
 
 // draw text
 aCtx.core20fwd->glActiveTexture(GL_TEXTURE0); // our shader is bound to first texture unit
- myTextProgram->use(aCtx);
- myTextProgram->setProjMat(aCtx, getCamera()->getProjMatrix());
- myTextProgram->setModelMat(aCtx, aModelMat);
- myTextProgram->setTextColor(aCtx, myToDrawShadow ? myShadowColor : aTextColor);
+ StGLTextProgram& aTextProgram = myRoot->getTextProgram();
+ aTextProgram.use(aCtx);
+ aTextProgram.setModelMat(aCtx, aModelMat);
+ aTextProgram.setColor(aCtx, myToDrawShadow ? myShadowColor : aTextColor);
 
 drawText(aCtx);
 
@@ -520,13 +311,13 @@
 0.0f));
 aModelMat.scale(aSizeOut, aSizeOut, 0.0f);
 
- myTextProgram->setModelMat(aCtx, aModelMat);
- myTextProgram->setTextColor(aCtx, aTextColor);
+ aTextProgram.setModelMat(aCtx, aModelMat);
+ aTextProgram.setColor(aCtx, aTextColor);
 
 drawText(aCtx);
 }
 
- myTextProgram->unuse(aCtx);
+ aTextProgram.unuse(aCtx);
 
 aCtx.core20fwd->glDisable(GL_BLEND);

sview-15_11.tar.gz/StGLWidgets/StGLTextBorderProgram.cpp Added

@@ -0,0 +1,76 @@
+/**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#include <StGLWidgets/StGLTextBorderProgram.h>
+
+#include <StGL/StGLContext.h>
+#include <StGL/StGLMatrix.h>
+#include <StGLCore/StGLCore20.h>
+
+StGLTextBorderProgram::StGLTextBorderProgram()
+: StGLProgram("StGLTextBorderProgram") {
+ //
+}
+
+StGLTextBorderProgram::~StGLTextBorderProgram() {
+ //
+}
+
+void StGLTextBorderProgram::setProjMat(StGLContext& theCtx,
+ const StGLMatrix& theProjMat) {
+ theCtx.core20fwd->glUniformMatrix4fv(myUniformProjMat, 1, GL_FALSE, theProjMat);
+}
+
+void StGLTextBorderProgram::setModelMat(StGLContext& theCtx,
+ const StGLMatrix& theModelMat) {
+ theCtx.core20fwd->glUniformMatrix4fv(myUniformModelMat, 1, GL_FALSE, theModelMat);
+}
+
+void StGLTextBorderProgram::setColor(StGLContext& theCtx,
+ const StGLVec4& theColor) {
+ theCtx.core20fwd->glUniform4fv(myUniformColor, 1, theColor);
+}
+
+bool StGLTextBorderProgram::init(StGLContext& theCtx) {
+ const char VERTEX_SHADER[] =
+ "uniform mat4 uProjMat; \
+ uniform mat4 uModelMat; \
+ attribute vec4 vVertex; \
+ void main(void) { \
+ gl_Position = uProjMat * uModelMat * vVertex; \
+ }";
+
+ const char FRAGMENT_SHADER[] =
+ "uniform vec4 uColor; \
+ void main(void) { \
+ gl_FragColor = uColor; \
+ }";
+
+ StGLVertexShader aVertexShader(StGLProgram::getTitle());
+ aVertexShader.init(theCtx, VERTEX_SHADER);
+ StGLAutoRelease aTmp1(theCtx, aVertexShader);
+
+ StGLFragmentShader aFragmentShader(StGLProgram::getTitle());
+ aFragmentShader.init(theCtx, FRAGMENT_SHADER);
+ StGLAutoRelease aTmp2(theCtx, aFragmentShader);
+ if(!StGLProgram::create(theCtx)
+ .attachShader(theCtx, aVertexShader)
+ .attachShader(theCtx, aFragmentShader)
+ .bindAttribLocation(theCtx, "vVertex", getVVertexLoc())
+ .link(theCtx)) {
+ return false;
+ }
+
+ myUniformProjMat = StGLProgram::getUniformLocation(theCtx, "uProjMat");
+ myUniformModelMat = StGLProgram::getUniformLocation(theCtx, "uModelMat");
+ myUniformColor = StGLProgram::getUniformLocation(theCtx, "uColor");
+ return myUniformProjMat.isValid()
+ && myUniformModelMat.isValid()
+ && myUniformColor.isValid();
+}

sview-15_11.tar.gz/StGLWidgets/StGLTextProgram.cpp Added

@@ -0,0 +1,101 @@
+/**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#include <StGLWidgets/StGLTextProgram.h>
+
+#include <StGL/StGLContext.h>
+#include <StGL/StGLMatrix.h>
+#include <StGLCore/StGLCore20.h>
+
+StGLTextProgram::StGLTextProgram()
+: StGLProgram("StGLTextProgram") {
+ //
+}
+
+StGLTextProgram::~StGLTextProgram() {
+ //
+}
+
+void StGLTextProgram::setProjMat(StGLContext& theCtx,
+ const StGLMatrix& theProjMat) {
+ theCtx.core20fwd->glUniformMatrix4fv(myUniformProjMat, 1, GL_FALSE, theProjMat);
+}
+
+void StGLTextProgram::setModelMat(StGLContext& theCtx,
+ const StGLMatrix& theModelMat) {
+ theCtx.core20fwd->glUniformMatrix4fv(myUniformModelMat, 1, GL_FALSE, theModelMat);
+}
+
+void StGLTextProgram::setColor(StGLContext& theCtx,
+ const StGLVec4& theColor) {
+ theCtx.core20fwd->glUniform4fv(myUniformColor, 1, theColor);
+}
+
+bool StGLTextProgram::init(StGLContext& theCtx) {
+ const char VERTEX_SHADER[] =
+ "uniform mat4 uProjMat; \
+ uniform mat4 uModelMat; \
+ attribute vec4 vVertex; \
+ attribute vec2 vTexCoord; \
+ varying vec2 fTexCoord; \
+ void main(void) { \
+ fTexCoord = vTexCoord; \
+ gl_Position = uProjMat * uModelMat * vVertex; \
+ }";
+
+ const char FRAGMENT_GET_RED[] =
+ "float getAlpha(void) { return texture2D(uTexture, fTexCoord).r; }";
+
+ const char FRAGMENT_GET_ALPHA[] =
+ "float getAlpha(void) { return texture2D(uTexture, fTexCoord).a; }";
+
+ const char FRAGMENT_SHADER[] =
+ "uniform sampler2D uTexture;"
+ "uniform vec4 uTextColor;"
+ "varying vec2 fTexCoord;"
+ "float getAlpha(void);"
+ "void main(void) {"
+ " vec4 color = uTextColor;"
+ " color.a *= getAlpha();"
+ " gl_FragColor = color;"
+ "}";
+
+ StGLVertexShader aVertexShader(StGLProgram::getTitle());
+ aVertexShader.init(theCtx, VERTEX_SHADER);
+ StGLAutoRelease aTmp1(theCtx, aVertexShader);
+
+ StGLFragmentShader aFragmentShader(StGLProgram::getTitle());
+ aFragmentShader.init(theCtx, FRAGMENT_SHADER,
+ theCtx.arbTexRG ? FRAGMENT_GET_RED : FRAGMENT_GET_ALPHA);
+ StGLAutoRelease aTmp2(theCtx, aFragmentShader);
+ if(!StGLProgram::create(theCtx)
+ .attachShader(theCtx, aVertexShader)
+ .attachShader(theCtx, aFragmentShader)
+ .bindAttribLocation(theCtx, "vVertex", getVVertexLoc())
+ .bindAttribLocation(theCtx, "vTexCoord", getVTexCoordLoc())
+ .link(theCtx)) {
+ return false;
+ }
+
+ myUniformProjMat = StGLProgram::getUniformLocation(theCtx, "uProjMat");
+ myUniformModelMat = StGLProgram::getUniformLocation(theCtx, "uModelMat");
+ myUniformColor = StGLProgram::getUniformLocation(theCtx, "uTextColor");
+
+ StGLVarLocation aUniformTexture = StGLProgram::getUniformLocation(theCtx, "uTexture");
+ if(aUniformTexture.isValid()) {
+ StGLProgram::use(theCtx);
+ theCtx.core20fwd->glUniform1i(aUniformTexture, StGLProgram::TEXTURE_SAMPLE_0);
+ StGLProgram::unuse(theCtx);
+ }
+
+ return myUniformProjMat.isValid()
+ && myUniformModelMat.isValid()
+ && myUniformColor.isValid()
+ && aUniformTexture.isValid();
+}

sview-15_10.tar.gz/StGLWidgets/StGLTextureButton.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLTextureButton.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLWidget.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLWidget.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLWidgetList.cpp -> sview-15_11.tar.gz/StGLWidgets/StGLWidgetList.cpp Changed

sview-15_10.tar.gz/StGLWidgets/StGLWidgets.cbp -> sview-15_11.tar.gz/StGLWidgets/StGLWidgets.cbp Changed

@@ -6,29 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/StGLWidgets" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../bin/$(TARGET_NAME)" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="user32" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StGLWidgets" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)" />
@@ -51,12 +28,12 @@
 					<Add library="user32" />
 				</Linker>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StGLWidgets" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -234,14 +211,15 @@
 		<Unit filename="StGLSwitchTextured.cpp" />
 		<Unit filename="StGLTable.cpp" />
 		<Unit filename="StGLTextArea.cpp" />
+		<Unit filename="StGLTextBorderProgram.cpp" />
+		<Unit filename="StGLTextProgram.cpp" />
 		<Unit filename="StGLTextureButton.cpp" />
 		<Unit filename="StGLWidget.cpp" />
 		<Unit filename="StGLWidgetList.cpp" />
 		<Unit filename="StGLWidgets.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StSubQueue.cpp" />
@@ -275,6 +253,8 @@
 		<Unit filename="../include/StGLWidgets/StGLSwitchTextured.h" />
 		<Unit filename="../include/StGLWidgets/StGLTable.h" />
 		<Unit filename="../include/StGLWidgets/StGLTextArea.h" />
+		<Unit filename="../include/StGLWidgets/StGLTextBorderProgram.h" />
+		<Unit filename="../include/StGLWidgets/StGLTextProgram.h" />
 		<Unit filename="../include/StGLWidgets/StGLTextureButton.h" />
 		<Unit filename="../include/StGLWidgets/StGLWidget.h" />
 		<Unit filename="../include/StGLWidgets/StGLWidgetList.h" />

sview-15_10.tar.gz/StGLWidgets/StGLWidgets.vcxproj -> sview-15_11.tar.gz/StGLWidgets/StGLWidgets.vcxproj Changed

sview-15_10.tar.gz/StGLWidgets/StGLWidgets.vcxproj.filters -> sview-15_11.tar.gz/StGLWidgets/StGLWidgets.vcxproj.filters Changed

sview-15_10.tar.gz/StGLWidgets/StSubQueue.cpp -> sview-15_11.tar.gz/StGLWidgets/StSubQueue.cpp Changed

sview-15_10.tar.gz/StImageViewer/StImageLoader.cpp -> sview-15_11.tar.gz/StImageViewer/StImageLoader.cpp Changed

@@ -49,11 +49,12 @@
 StImageLoader::StImageLoader(const StImageFile::ImageClass theImageLib,
 const StHandle<StMsgQueue>& theMsgQueue,
 const StHandle<StLangMap>& theLangMap,
+ const StHandle<StPlayList>& thePlayList,
 const StHandle<StGLTextureQueue>& theTextureQueue,
 const GLint theMaxTexDim)
 : myMimeList(ST_IMAGES_MIME_STRING),
 myLangMap(theLangMap),
- myPlayList(1),
+ myPlayList(thePlayList),
 myLoadNextEvent(false),
 myStFormatByUser(StFormat_AUTO),
 myMaxTexDim(theMaxTexDim),
@@ -61,7 +62,7 @@
 myMsgQueue(theMsgQueue),
 myImageLib(theImageLib),
 myAction(Action_NONE) {
- myPlayList.setExtensions(myMimeList.getExtensionsList());
+ myPlayList->setExtensions(myMimeList.getExtensionsList());
 myThread = new StThread(threadFunction, (void* )this, "StImageLoader");
 }
 
@@ -208,6 +209,9 @@
 return false;
 }
 
+ // clear active
+ myTextureQueue->clear();
+
 StHandle<StImageInfo> anImgInfo = new StImageInfo();
 anImgInfo->Id = theParams;
 anImgInfo->Path = aFilePath;
@@ -358,6 +362,12 @@
 }
 const double aLoadTimeMSec = aLoadTimer.getElapsedTimeInMilliSec();
 
+ // copy metadata
+ for(size_t aTagIter = 0; aTagIter < anImageFileL->getMetadata().size(); ++aTagIter) {
+ const StDictEntry& aTag = anImageFileL->getMetadata().getFromIndex(aTagIter);
+ anImgInfo->Info.add(aTag);
+ }
+
 // detect information from file name
 bool isAnamorphByName = false;
 anImgInfo->StInfoFileName = st::formatFromName(aTitleString, isAnamorphByName);
@@ -431,15 +441,22 @@
 #endif
 
 // finally push image data in Texture Queue
- while(myTextureQueue->isFull()) {
- StThread::sleep(10);
- }
-
 myTextureQueue->setConnectedStream(true);
+
 if(!anImageR->isNull()) {
- myTextureQueue->push(*anImageL, *anImageR, theParams, StFormat_SeparateFrames, aSrcCubemap, 0.0);
- } else {
- myTextureQueue->push(*anImageL, *anImageR, theParams, aSrcFormatCurr, aSrcCubemap, 0.0);
+ aSrcFormatCurr = StFormat_SeparateFrames;
+ }
+
+ {
+ StImage anImageRefL, anImageRefR;
+ StHandle<StBufferCounter> aRefL = new StImageFileCounter(anImageL);
+ anImageRefL.initReference(*anImageL, aRefL);
+ if(!anImageR->isNull()) {
+ StHandle<StBufferCounter> aRefR = new StImageFileCounter(anImageR);
+ anImageRefR.initReference(*anImageR, aRefR);
+ }
+
+ myTextureQueue->push(anImageRefL, anImageRefR, theParams, aSrcFormatCurr, aSrcCubemap, 0.0);
 }
 
 if(!stAreEqual(anImageFileL->getPixelRatio(), 1.0f, 0.001f)) {
@@ -639,7 +656,7 @@
 myAction = Action_NONE;
 myLoadNextEvent.reset();
 // save current image (set as current in playlist)
- if(myPlayList.getCurrentFile(aFileToLoad, aFileParams)) {
+ if(myPlayList->getCurrentFile(aFileToLoad, aFileParams)) {
 saveImage(aFileToLoad, aFileParams, anImgType);
 }
 break;
@@ -660,7 +677,7 @@
 default: {
 // load next image (set as current in playlist)
 myLoadNextEvent.reset();
- if(myPlayList.getCurrentFile(aFileToLoad, aFileParams)) {
+ if(myPlayList->getCurrentFile(aFileToLoad, aFileParams)) {
 loadImage(aFileToLoad, aFileParams);
 }
 break;

sview-15_10.tar.gz/StImageViewer/StImageLoader.h -> sview-15_11.tar.gz/StImageViewer/StImageLoader.h Changed

@@ -73,6 +73,7 @@
 ST_LOCAL StImageLoader(const StImageFile::ImageClass theImageLib,
 const StHandle<StMsgQueue>& theMsgQueue,
 const StHandle<StLangMap>& theLangMap,
+ const StHandle<StPlayList>& thePlayList,
 const StHandle<StGLTextureQueue>& theTextureQueue,
 const GLint theMaxTexDim);
 ST_LOCAL ~StImageLoader();
@@ -119,7 +120,7 @@
 }
 
 ST_LOCAL StPlayList& getPlayList() {
- return myPlayList;
+ return *myPlayList;
 }
 
 ST_LOCAL void setStereoFormat(const StFormat theSrcFormat) {
@@ -179,7 +180,7 @@
 const StMIMEList myMimeList;
 StHandle<StThread> myThread; //!< main loop thread
 StHandle<StLangMap> myLangMap; //!< translations dictionary
- StPlayList myPlayList; //!< play list
+ StHandle<StPlayList> myPlayList; //!< play list
 mutable StMutex myLock; //!< lock to access not thread-safe properties
 StCondition myLoadNextEvent;
 StFormat myStFormatByUser;//!< target source format (auto-detect by default)

sview-15_10.tar.gz/StImageViewer/StImageViewer.cbp -> sview-15_11.tar.gz/StImageViewer/StImageViewer.cbp Changed

@@ -6,36 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStImageViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Comdlg32" />
-					<Add library="shell32" />
-					<Add library="Wsock32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StImageViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -68,11 +38,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StImageViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -276,9 +246,8 @@
 		<Unit filename="StImageViewer.h" />
 		<Unit filename="StImageViewer.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StImageViewerGUI.cpp" />

sview-15_10.tar.gz/StImageViewer/StImageViewer.cpp -> sview-15_11.tar.gz/StImageViewer/StImageViewer.cpp Changed

@@ -29,10 +29,12 @@
 #include <StGLWidgets/StGLImageRegion.h>
 #include <StGLWidgets/StGLMessageBox.h>
 #include <StGLWidgets/StGLMsgStack.h>
+#include <StGLWidgets/StGLPlayList.h>
 #include <StSettings/StSettings.h>
 #include <StSocket/StCheckUpdates.h>
 #include <StThreads/StThread.h>
 #include <StImage/StImageFile.h>
+#include <StCore/StSearchMonitors.h>
 
 #include "../StOutAnaglyph/StOutAnaglyph.h"
 #include "../StOutDual/StOutDual.h"
@@ -54,10 +56,10 @@
 static const char ST_SETTING_RECENT_L[] = "recentL";
 static const char ST_SETTING_RECENT_R[] = "recentR";
 static const char ST_SETTING_SAVE_RECENT[] = "toSaveRecent";
+ static const char ST_SETTING_SHOW_LIST[] = "showPlaylist";
 static const char ST_SETTING_COMPRESS[] = "toCompress";
 static const char ST_SETTING_ESCAPENOQUIT[]= "escNoQuit";
 static const char ST_SETTING_FULLSCREENUI[]= "fullScreenUI";
- static const char ST_SETTING_SHOW_TOOLBAR[]= "toShowToolbar";
 
 static const char ST_SETTING_SCALE_ADJUST[] = "scaleAdjust";
 static const char ST_SETTING_SCALE_FORCE2X[] = "scale2X";
@@ -81,6 +83,14 @@
 static const char ST_ARGUMENT_FILE_RIGHT[] = "right";
 static const char ST_ARGUMENT_FILE_LAST[] = "last";
 
+ static const char ST_ARGUMENT_SHOW_MENU[] = "toShowMenu";
+ static const char ST_ARGUMENT_SHOW_TOPBAR[]= "toShowTopbar";
+ static const char ST_ARGUMENT_MONITOR[] = "monitorId";
+ static const char ST_ARGUMENT_WINLEFT[] = "windowLeft";
+ static const char ST_ARGUMENT_WINTOP[] = "windowTop";
+ static const char ST_ARGUMENT_WINWIDTH[] = "windowWidth";
+ static const char ST_ARGUMENT_WINHEIGHT[] = "windowHeight";
+
 }
 
 /**
@@ -250,6 +260,7 @@
 const StHandle<StOpenInfo>& theOpenInfo,
 const StString& theAppName)
 : StApplication(theResMgr, theParentWin, theOpenInfo),
+ myPlayList(new StPlayList(1, false)),
 myAppName(!theAppName.isEmpty() ? theAppName : ST_DRAWER_PLUGIN_NAME),
 myEventLoaded(false),
 //
@@ -290,9 +301,12 @@
 params.checkUpdatesDays = new StInt32Param(7);
 params.srcFormat = new StInt32Param(StFormat_AUTO);
 params.srcFormat->signals.onChanged.connect(this, &StImageViewer::doSwitchSrcFormat);
+ params.ToShowPlayList = new StBoolParam(false);
+ params.ToShowPlayList->signals.onChanged = stSlot(this, &StImageViewer::doShowPlayList);
 params.ToTrackHead = new StBoolParamNamed(true, tr(StImageViewerStrings::MENU_VIEW_TRACK_HEAD));
 params.ToShowFps = new StBoolParamNamed(false, tr(StImageViewerStrings::MENU_SHOW_FPS));
- params.ToShowToolbar = new StBoolParamNamed(true, "Show toolbar");
+ params.ToShowMenu = new StBoolParamNamed(true, "Show main menu");
+ params.ToShowTopbar = new StBoolParamNamed(true, "Show top toolbar");
 params.IsMobileUI = new StBoolParamNamed(StWindow::isMobile(), "Mobile UI");
 params.IsMobileUI->signals.onChanged = stSlot(this, &StImageViewer::doScaleHiDPI);
 params.IsVSyncOn = new StBoolParam(true);
@@ -311,6 +325,7 @@
 mySettings->loadParam (ST_SETTING_SHOW_FPS, params.ToShowFps);
 mySettings->loadParam (ST_SETTING_MOBILE_UI, params.IsMobileUI);
 mySettings->loadParam (ST_SETTING_VSYNC, params.IsVSyncOn);
+ mySettings->loadParam (ST_SETTING_SHOW_LIST, params.ToShowPlayList);
 
 int32_t aSlideShowDelayInt = int32_t(mySlideShowDelay);
 mySettings->loadInt32 (ST_SETTING_SLIDESHOW_DELAY, aSlideShowDelayInt);
@@ -445,6 +460,7 @@
 mySettings->saveParam (ST_SETTING_SHOW_FPS, params.ToShowFps);
 mySettings->saveParam (ST_SETTING_MOBILE_UI, params.IsMobileUI);
 mySettings->saveParam (ST_SETTING_VSYNC, params.IsVSyncOn);
+ mySettings->saveParam (ST_SETTING_SHOW_LIST, params.ToShowPlayList);
 if(myToSaveSrcFormat) {
 mySettings->saveParam(ST_SETTING_SRCFORMAT, params.srcFormat);
 }
@@ -497,7 +513,7 @@
 
 // create the GUI with default values
 params.ScaleHiDPI->setValue(myWindow->getScaleFactor());
- myGUI = new StImageViewerGUI(this, myWindow.access(), myLangMap.access(),
+ myGUI = new StImageViewerGUI(this, myWindow.access(), myLangMap.access(), myPlayList,
 myLoader.isNull() ? NULL : myLoader->getTextureQueue());
 myGUI->setContext(myContext);
 
@@ -571,7 +587,7 @@
 StString anImgLibStr;
 mySettings->loadString(ST_SETTING_IMAGELIB, anImgLibStr);
 params.imageLib = StImageFile::imgLibFromString(anImgLibStr);
- myLoader = new StImageLoader(params.imageLib, myMsgQueue, myLangMap,
+ myLoader = new StImageLoader(params.imageLib, myMsgQueue, myLangMap, myPlayList,
 myGUI->myImage->getTextureQueue(), myContext->getMaxTextureSize());
 myLoader->signals.onLoaded.connect(this, &StImageViewer::doLoaded);
 myLoader->setCompressMemory(myWindow->isMobile());
@@ -597,47 +613,92 @@
 }
 
 void StImageViewer::parseArguments(const StArgumentsMap& theArguments) {
- StArgument argFullscreen = theArguments[ST_SETTING_FULLSCREEN];
- StArgument argSlideshow = theArguments[ST_SETTING_SLIDESHOW];
- StArgument argViewMode = theArguments[ST_SETTING_VIEWMODE];
- StArgument argSrcFormat = theArguments[ST_SETTING_SRCFORMAT];
- StArgument argImgLibrary = theArguments[ST_SETTING_IMAGELIB];
- StArgument argToCompress = theArguments[ST_SETTING_COMPRESS];
- StArgument argEscNoQuit = theArguments[ST_SETTING_ESCAPENOQUIT];
- StArgument argFullScreenUI = theArguments[ST_SETTING_FULLSCREENUI];
- StArgument argToolbar = theArguments[ST_SETTING_SHOW_TOOLBAR];
- StArgument argSaveRecent = theArguments[ST_SETTING_SAVE_RECENT];
- if(argToCompress.isValid()) {
- myLoader->setCompressMemory(!argToCompress.isValueOff());
- }
- if(argEscNoQuit.isValid()) {
- myEscNoQuit = !argEscNoQuit.isValueOff();
- }
- if(argFullScreenUI.isValid()) {
- myToHideUIFullScr = argFullScreenUI.isValueOff();
- }
- if(argToolbar.isValid()) {
- params.ToShowToolbar->setValue(!argToolbar.isValueOff());
- }
- if(argFullscreen.isValid()) {
- params.isFullscreen->setValue(!argFullscreen.isValueOff());
- }
- if(argSlideshow.isValid() && !argSlideshow.isValueOff()) {
+ StArgument anArgSlideshow = theArguments[ST_SETTING_SLIDESHOW];
+ StArgument anArgViewMode = theArguments[ST_SETTING_VIEWMODE];
+ StArgument anArgSrcFormat = theArguments[ST_SETTING_SRCFORMAT];
+ StArgument anArgImgLibrary = theArguments[ST_SETTING_IMAGELIB];
+ StArgument anArgToCompress = theArguments[ST_SETTING_COMPRESS];
+ StArgument anArgEscNoQuit = theArguments[ST_SETTING_ESCAPENOQUIT];
+ StArgument anArgFullScreenUI = theArguments[ST_SETTING_FULLSCREENUI];
+ StArgument anArgShowMenu = theArguments[ST_ARGUMENT_SHOW_MENU];
+ StArgument anArgShowTopbar = theArguments[ST_ARGUMENT_SHOW_TOPBAR];
+ StArgument anArgSaveRecent = theArguments[ST_SETTING_SAVE_RECENT];
+
+ StArgument anArgFullscreen = theArguments[ST_SETTING_FULLSCREEN];
+ StArgument anArgMonitor = theArguments[ST_ARGUMENT_MONITOR];
+ StArgument anArgWinLeft = theArguments[ST_ARGUMENT_WINLEFT];
+ StArgument anArgWinTop = theArguments[ST_ARGUMENT_WINTOP];
+ StArgument anArgWinWidth = theArguments[ST_ARGUMENT_WINWIDTH];
+ StArgument anArgWinHeight = theArguments[ST_ARGUMENT_WINHEIGHT];
+ StRect<int32_t> aRect = myWindow->getWindowedPlacement();
+ bool toSetRect = false;
+ if(anArgMonitor.isValid()) {
+ const size_t aMonId = (size_t )::atol(anArgMonitor.getValue().toCString());
+ const StMonitor& aMonOld = myWindow->getMonitors()[aRect.center()];
+ const StMonitor& aMonNew = myWindow->getMonitors()[aMonId];
+ if(aMonOld.getId() != aMonNew.getId()) {
+ const int aLeft = aRect.left() - aMonOld.getVRect().left();
+ const int aTop = aRect.top() - aMonOld.getVRect().top();
+ aRect.moveLeftTo(aMonNew.getVRect().left() + aLeft);
+ aRect.moveTopTo (aMonNew.getVRect().top() + aTop);
+ toSetRect = true;
+ }
+ }
+ if(anArgWinLeft.isValid()) {
+ aRect.moveLeftTo(::atol(anArgWinLeft.getValue().toCString()));
+ toSetRect = true;
+ }
+ if(anArgWinTop.isValid()) {
+ aRect.moveTopTo(::atol(anArgWinTop.getValue().toCString()));
+ toSetRect = true;
+ }
+ if(anArgWinWidth.isValid()) {
+ aRect.right() = aRect.left() + ::atol(anArgWinWidth.getValue().toCString());
+ toSetRect = true;
+ }
+ if(anArgWinHeight.isValid()) {
+ aRect.bottom() = aRect.top() + ::atol(anArgWinHeight.getValue().toCString());
+ toSetRect = true;
+ }
+ if(toSetRect) {
+ myWindow->setPlacement(aRect, true);
+ }
+ if(anArgFullscreen.isValid()) {
+ params.isFullscreen->setValue(!anArgFullscreen.isValueOff());
+ }
+
+ if(anArgToCompress.isValid()) {
+ myLoader->setCompressMemory(!anArgToCompress.isValueOff());
+ }
+ if(anArgEscNoQuit.isValid()) {
+ myEscNoQuit = !anArgEscNoQuit.isValueOff();
+ }
+ if(anArgFullScreenUI.isValid()) {
+ myToHideUIFullScr = anArgFullScreenUI.isValueOff();
+ }
+ if(anArgShowMenu.isValid()) {
+ params.ToShowMenu->setValue(!anArgShowMenu.isValueOff());
+ }
+ if(anArgShowTopbar.isValid()) {
+ params.ToShowTopbar->setValue(!anArgShowTopbar.isValueOff());
+ }
+ if( anArgSlideshow.isValid()
+ && !anArgSlideshow.isValueOff()) {
 doSlideShow();
 }
- if(argViewMode.isValid()) {
- myLoader->getPlayList().changeDefParams().ViewingMode = StStereoParams::GET_VIEW_MODE_FROM_STRING(argViewMode.getValue());
+ if(anArgViewMode.isValid()) {
+ myLoader->getPlayList().changeDefParams().ViewingMode = StStereoParams::GET_VIEW_MODE_FROM_STRING(anArgViewMode.getValue());
 }
- if(argSrcFormat.isValid()) {
- params.srcFormat->setValue(st::formatFromString(argSrcFormat.getValue()));
+ if(anArgSrcFormat.isValid()) {
+ params.srcFormat->setValue(st::formatFromString(anArgSrcFormat.getValue()));
 myToSaveSrcFormat = false; // this setting is temporary!
 }
- if(argImgLibrary.isValid()) {
- params.imageLib = StImageFile::imgLibFromString(argImgLibrary.getValue());
+ if(anArgImgLibrary.isValid()) {
+ params.imageLib = StImageFile::imgLibFromString(anArgImgLibrary.getValue());
 myLoader->setImageLib(params.imageLib);
 }
- if(argSaveRecent.isValid()) {
- params.ToSaveRecent->setValue(!argSaveRecent.isValueOff());
+ if(anArgSaveRecent.isValid()) {
+ params.ToSaveRecent->setValue(!anArgSaveRecent.isValueOff());
 }
 }
 
@@ -932,12 +993,38 @@
 }
 
 void StImageViewer::doFileDrop(const StDNDropEvent& theEvent) {
- const StString aFilePath = theEvent.File;
- if(myLoader->getPlayList().checkExtension(aFilePath)) {
- myLoader->getPlayList().open(aFilePath);
+ if(theEvent.NbFiles == 0) {
+ return;
+ }
+
+ const StString aFile1 = theEvent.Files[0];
+ if(!myLoader->getPlayList().checkExtension(aFile1)) {
+ return;
+ } else if(theEvent.NbFiles == 1) {
+ myLoader->getPlayList().open(aFile1);
+ doUpdateStateLoading();
+ myLoader->doLoadNext();
+ return;
+ } else if(theEvent.NbFiles == 2
+ && !StFolder::isFolder(aFile1)
+ && !StFolder::isFolder(StString(theEvent.Files[1]))) {
+ myLoader->getPlayList().clear();
+ myLoader->getPlayList().addOneFile(aFile1, StString(theEvent.Files[1]));
 doUpdateStateLoading();
 myLoader->doLoadNext();
+ return;
+ }
+
+ myLoader->getPlayList().clear();
+ for(uint32_t aFileIter = 0; aFileIter < theEvent.NbFiles; ++aFileIter) {
+ StString aPath(theEvent.Files[aFileIter]);
+ if(!StFolder::isFolder(aPath)) {
+ myLoader->getPlayList().addOneFile(aPath, StMIME());
+ }
 }
+
+ doUpdateStateLoading();
+ myLoader->doLoadNext();
 }
 
 void StImageViewer::doNavigate(const StNavigEvent& theEvent) {
@@ -981,7 +1068,6 @@
 myLoader->doLoadNext();
 }
 
- const bool isMouseMove = myWindow->isMouseMoved();
 if(mySlideShowTimer.getElapsedTimeInSec() > mySlideShowDelay) {
 mySlideShowTimer.restart();
 doListNext();
@@ -999,7 +1085,7 @@
 }
 
 const bool isFullScreen = params.isFullscreen->getValue();
- myGUI->setVisibility(myWindow->getMousePos(), isMouseMove, myToHideUIFullScr && isFullScreen);
+ myGUI->setVisibility(myWindow->getMousePos(), myToHideUIFullScr && isFullScreen);
 bool toHideCursor = isFullScreen && myGUI->toHideCursor();
 myWindow->showCursor(!toHideCursor);
 }
@@ -1235,6 +1321,24 @@
 myEventLoaded.set();
 }
 
+void StImageViewer::doShowPlayList(const bool theToShow) {
+ if(myGUI.isNull()
+ || myGUI->myPlayList == NULL) {
+ return;
+ }
+
+ myGUI->myPlayList->setOpacity(theToShow ? 1.0f : 0.0f, false);
+}
+
+void StImageViewer::doFileNext() {
+ if(myLoader.isNull()) {
+ return;
+ }
+
+ myLoader->doLoadNext();
+ doUpdateStateLoading();
+}
+
 bool StImageViewer::getCurrentFile(StHandle<StFileNode>& theFileNode,
 StHandle<StStereoParams>& theParams,
 StHandle<StImageInfo>& theInfo) {

sview-15_10.tar.gz/StImageViewer/StImageViewer.h -> sview-15_11.tar.gz/StImageViewer/StImageViewer.h Changed

@@ -131,7 +131,9 @@
 StHandle<StInt32Param> checkUpdatesDays; //!< days count between updates checks
 StHandle<StInt32Param> srcFormat; //!< source format
 StHandle<StBoolParam> ToTrackHead; //!< enable/disable head-tracking
- StHandle<StBoolParam> ToShowToolbar; //!< show/hide toolbar
+ StHandle<StBoolParam> ToShowMenu; //!< show main menu
+ StHandle<StBoolParam> ToShowTopbar; //!< show topbar
+ StHandle<StBoolParam> ToShowPlayList; //!< display playlist
 StHandle<StBoolParam> ToShowFps; //!< display FPS meter
 StHandle<StBoolParam> IsMobileUI; //!< display mobile interface
 StHandle<StBoolParam> IsVSyncOn; //!< flag to use VSync
@@ -158,6 +160,8 @@
 ST_LOCAL void doSwitchSrcFormat(const int32_t theSrcFormat);
 ST_LOCAL void doSwitchViewMode(const int32_t theMode);
 ST_LOCAL void doPanoramaOnOff(const size_t );
+ ST_LOCAL void doShowPlayList(const bool theToShow);
+ ST_LOCAL void doFileNext();
 
 public:
 
@@ -216,6 +220,7 @@
 StHandle<StGLContext> myContext;
 StHandle<StSettings> mySettings; //!< settings manager for Image Viewer plugin
 StHandle<StTranslations> myLangMap; //!< translated strings map
+ StHandle<StPlayList> myPlayList; //!< play list
 StHandle<StImageViewerGUI> myGUI; //!< GUI root widget
 StHandle<StImageLoader> myLoader; //!< main image loader class
 StHandle<StCheckUpdates> myUpdates; //!< check updates utility

sview-15_10.tar.gz/StImageViewer/StImageViewerGUI.cpp -> sview-15_11.tar.gz/StImageViewer/StImageViewerGUI.cpp Changed

@@ -35,6 +35,7 @@
 #include <StGLWidgets/StGLMenuItem.h>
 #include <StGLWidgets/StGLMsgStack.h>
 #include <StGLWidgets/StGLOpenFile.h>
+#include <StGLWidgets/StGLPlayList.h>
 #include <StGLWidgets/StGLRangeFieldFloat32.h>
 #include <StGLWidgets/StGLScrollArea.h>
 #include <StGLWidgets/StGLSwitchTextured.h>
@@ -62,32 +63,51 @@
 myPlugin->doSaveImageInfo(0);
 }
 
-void StImageViewerGUI::createDesktopUI() {
+void StImageViewerGUI::createDesktopUI(const StHandle<StPlayList>& thePlayList) {
 if(myPlugin->params.ToShowFps->getValue()) {
 myFpsWidget = new StGLFpsLabel(this);
 }
 
 createUpperToolbar();
 
- const StMarginsI& aMargins = getRootMargins();
+ const StMarginsI& aRootMargins = getRootMargins();
 StMarginsI aButtonMargins;
 const IconSize anIconSize = scaleIcon(32, aButtonMargins);
- /*myBtnPlayList = new StGLTextureButton(this, -aMargins.right - scale(8 + 8 + 32), -aMargins.bottom - scale(8),
- StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_RIGHT));
- myBtnPlayList->setTexturePath(iconTexture(stCString("playList"), anIconSize));
- myBtnPlayList->changeMargins() = aButtonMargins;*/
+ const int anIconStep = scale(32);
 
- // fullscreen button
+ myPanelBottom = new StGLContainer(this, aRootMargins.left, -aRootMargins.bottom, StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_LEFT), scale(4096), scale(32));
+ int aBottomBarNbRight = 0;
+ const int aRight = -scale(8);
+ const int aBottom = -scale(8);
 if(myWindow->hasFullscreenMode()) {
- myBtnFull = new StGLTextureButton(this, -aMargins.right - scale(8), -aMargins.bottom - scale(8),
- StGLCorner(ST_VCORNER_BOTTOM, ST_HCORNER_RIGHT));
- myBtnFull->signals.onBtnClick.connect(myPlugin->params.isFullscreen.operator->(), &StBoolParam::doReverse);
- myBtnFull->setTexturePath(iconTexture(stCString("fullScreen"), anIconSize));
+ myBtnFull = new StGLCheckboxTextured(myPanelBottom, myPlugin->params.isFullscreen,
+ iconTexture(stCString("actionVideoFullscreenOff"), anIconSize),
+ iconTexture(stCString("actionVideoFullscreenOn"), anIconSize),
+ (aBottomBarNbRight++) * (-anIconStep) + aRight, aBottom,
+ StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+ myBtnFull->setDrawShadow(true);
+ myBtnFull->setFalseOpacity(1.0f);
 myBtnFull->changeMargins() = aButtonMargins;
 }
 
+ myBtnList = new StGLCheckboxTextured(myPanelBottom, myPlugin->params.ToShowPlayList,
+ iconTexture(stCString("actionVideoPlaylistOff"), anIconSize),
+ iconTexture(stCString("actionVideoPlaylist"), anIconSize),
+ (aBottomBarNbRight++) * (-anIconStep) + aRight, aBottom,
+ StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+ myBtnList->setDrawShadow(true);
+ myBtnList->changeMargins() = aButtonMargins;
+
 myDescr = new StGLDescription(this);
 
+ myPlayList = new StGLPlayList(this, thePlayList);
+ myPlayList->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+ myPlayList->changeFitMargins().top = scale(110);
+ myPlayList->changeFitMargins().bottom = scale(110);
+ //myPlayList->changeMargins().bottom = scale(32);
+ myPlayList->setOpacity(myPlugin->params.ToShowPlayList->getValue() ? 1.0f : 0.0f, false);
+ myPlayList->signals.onOpenItem = stSlot(myPlugin, &StImageViewer::doFileNext);
+
 // create Main menu
 createMainMenu();
 }
@@ -387,7 +407,7 @@
 StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
 
 const StGLVec3 aBlack(0.0f, 0.0f, 0.0f);
- const StGLVec3 aGreen(0.4f, 0.8f, 0.4f);
+ const StGLVec3 aGreen(0.0f, 0.6f, 0.4f);
 const StGLVec3 aRed (1.0f, 0.0f, 0.0f);
 
 aMenu->addItem(tr(MENU_VIEW_ADJUST_RESET), myPlugin->getAction(StImageViewer::Action_ImageAdjustReset))
@@ -799,10 +819,18 @@
 return aMenu;
 }
 
-void StImageViewerGUI::createMobileUI() {
+void StImageViewerGUI::createMobileUI(const StHandle<StPlayList>& thePlayList) {
 createMobileUpperToolbar();
 createMobileBottomToolbar();
 
+ myPlayList = new StGLPlayList(this, thePlayList);
+ myPlayList->setCorner(StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+ myPlayList->changeFitMargins().top = scale(56);
+ myPlayList->changeFitMargins().bottom = scale(100);
+ //myPlayList->changeMargins().bottom = scale(56);
+ myPlayList->setOpacity(myPlugin->params.ToShowPlayList->getValue() ? 1.0f : 0.0f, false);
+ myPlayList->signals.onOpenItem = stSlot(myPlugin, &StImageViewer::doFileNext);
+
 if(myPlugin->params.ToShowFps->getValue()) {
 myFpsWidget = new StGLFpsLabel(this);
 }
@@ -925,6 +953,14 @@
 aBtnZoomOut->setDrawShadow(true);
 aBtnZoomOut->setUserData(StImageViewer::Action_StereoParamsBegin + StGLImageRegion::Action_ScaleOut);
 aBtnZoomOut->signals.onBtnHold += stSlot(this, &StImageViewerGUI::doAction);
+
+ myBtnList = new StGLCheckboxTextured(myPanelBottom, myPlugin->params.ToShowPlayList,
+ iconTexture(stCString("actionVideoPlaylistOff"), anIconSize),
+ iconTexture(stCString("actionVideoPlaylist"), anIconSize),
+ (aBtnIter++) * (-anIconStep), 0,
+ StGLCorner(ST_VCORNER_TOP, ST_HCORNER_RIGHT));
+ myBtnList->setDrawShadow(true);
+ myBtnList->changeMargins() = aButtonMargins;
 }
 
 void StImageViewerGUI::doOpenFile(const size_t ) {
@@ -935,8 +971,15 @@
 
 StGLOpenFile* aDialog = new StGLOpenFile(this, tr(DIALOG_OPEN_FILE), tr(BUTTON_CLOSE));
 aDialog->setMimeList(myPlugin->myLoader->getMimeList());
+#if defined(_WIN32)
+ //
+#else
+ aDialog->addHotItem("/", "Root");
+#endif
+ aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_SdCard));
 aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Downloads));
 aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Pictures));
+ aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Photos));
 aDialog->signals.onFileSelected = stSlot(myPlugin, &StImageViewer::doOpen1FileFromGui);
 
 if(myPlugin->params.lastFolder.isEmpty()) {
@@ -978,11 +1021,13 @@
 anItem = aMenu->addItem("Slideshow", myPlugin->getAction(StImageViewer::Action_SlideShow));
 anItem->setIcon(stCMenuIcon("actionSlideShow"));
 aMenu->stglInit();
+ setFocus(aMenu);
 }
 
 StImageViewerGUI::StImageViewerGUI(StImageViewer* thePlugin,
 StWindow* theWindow,
 StTranslations* theLangMap,
+ const StHandle<StPlayList>& thePlayList,
 const StHandle<StGLTextureQueue>& theTextureQueue)
 : StGLRootWidget(thePlugin->myResMgr),
 myPlugin(thePlugin),
@@ -993,6 +1038,7 @@
 myImage(NULL),
 myDescr(NULL),
 myMsgStack(NULL),
+ myPlayList(NULL),
 //
 myMenuRoot(NULL),
 //
@@ -1005,7 +1051,7 @@
 myBtnSwapLR(NULL),
 myBtnPanorama(NULL),
 myBtnSrcFrmt(NULL),
- myBtnPlayList(NULL),
+ myBtnList(NULL),
 myBtnFull(NULL),
 //
 myFpsWidget(NULL),
@@ -1035,9 +1081,9 @@
 myImage->params.ViewMode->signals.onChanged += stSlot(myPlugin, &StImageViewer::doSwitchViewMode);
 
 if(isMobile()) {
- createMobileUI();
+ createMobileUI(thePlayList);
 } else {
- createDesktopUI();
+ createDesktopUI(thePlayList);
 }
 
 myMsgStack = new StGLMsgStack(this, myPlugin->getMessagesQueue());
@@ -1080,22 +1126,26 @@
 }
 
 void StImageViewerGUI::setVisibility(const StPointD_t& theCursor,
- bool isMouseActive,
 bool toForceHide) {
- const bool toShowToolbar = !myIsMinimalGUI
- && myPlugin->params.ToShowToolbar->getValue();
- const bool hasUpperPanel = toShowToolbar
+ const bool toShowPlayList = myPlugin->params.ToShowPlayList->getValue();
+ const bool hasMainMenu = myPlugin->params.ToShowMenu->getValue()
+ && myMenuRoot != NULL;
+ const bool hasUpperPanel = !myIsMinimalGUI
+ && myPlugin->params.ToShowTopbar->getValue()
 && myPanelUpper != NULL;
- const bool hasBottomPanel = toShowToolbar
+ const bool hasBottomPanel = !myIsMinimalGUI
 && myPanelBottom != NULL;
+ const bool isMouseActive = myWindow->isMouseMoved();
 
 StHandle<StStereoParams> aParams = myImage->getSource();
+ const double aStillTime = myVisibilityTimer.getElapsedTime();
 myIsVisibleGUI = isMouseActive
 || aParams.isNull()
- || myVisibilityTimer.getElapsedTime() < 2.0
+ || aStillTime < 2.0
 || (hasUpperPanel && myPanelUpper ->isPointIn(theCursor))
 || (hasBottomPanel && myPanelBottom->isPointIn(theCursor))
- || (myMenuRoot != NULL && myMenuRoot->isActive());
+ || (myPlayList != NULL && toShowPlayList && myPlayList->isPointIn(theCursor))
+ || (hasMainMenu && myMenuRoot->isActive());
 
 if(isMouseActive) {
 myVisibilityTimer.restart();
@@ -1104,22 +1154,36 @@
 const float anOpacity = (float )myVisLerp.perform(toShowAll, toForceHide);
 
 if(myMenuRoot != NULL) {
- myMenuRoot->setOpacity(anOpacity, true);
+ myMenuRoot->setOpacity(hasMainMenu ? anOpacity : 0.0f, true);
 }
-
 if(myPanelUpper != NULL) {
 myPanelUpper->setOpacity(hasUpperPanel ? anOpacity : 0.0f, true);
 }
 if(myPanelBottom != NULL) {
 myPanelBottom->setOpacity(hasBottomPanel ? anOpacity : 0.0f, true);
 }
- if(myBtnPlayList != NULL) {
- //myBtnPlayList->setOpacity(hasBottomPanel ? anOpacity : 0.0f, false);
+ if(myPlayList != NULL
+ && toShowPlayList) {
+ myPlayList->setOpacity(anOpacity, true);
 }
 if(myBtnFull != NULL) {
+ if(myIsMinimalGUI
+ && myPanelBottom != NULL) {
+ myPanelBottom->setOpacity(1.0f, false);
+ }
 myBtnFull->setOpacity(myIsMinimalGUI ? 1.0f : anOpacity, false);
 }
 
+ const StPlayList::CurrentPosition aCurrPos = myPlugin->myLoader->getPlayList().getCurrentPosition();
+ if(myBtnPrev != NULL) {
+ myBtnPrev->setOpacityScale(aCurrPos == StPlayList::CurrentPosition_Middle
+ || aCurrPos == StPlayList::CurrentPosition_Last ? 1.0f : 0.5f);
+ }
+ if(myBtnNext != NULL) {
+ myBtnNext->setOpacityScale(aCurrPos == StPlayList::CurrentPosition_Middle
+ || aCurrPos == StPlayList::CurrentPosition_First ? 1.0f : 0.5f);
+ }
+
 StFormat aSrcFormat = (StFormat )myPlugin->params.srcFormat->getValue();
 if(aSrcFormat == StFormat_AUTO
 && !aParams.isNull()) {
@@ -1157,7 +1221,7 @@
 myImage->setDeviceOrientation(StGLQuaternion((float )aQ.x(), (float )aQ.y(), (float )aQ.z(), (float )aQ.w()));
 
 if(myDescr != NULL) {
- myDescr->setOpacity(1.0f, true);
+ bool wasEmpty = myDescr->getText().isEmpty();
 if(::isPointIn(myBtnOpen, theCursor)) {
 myDescr->setText(tr(IMAGE_OPEN));
 } else if(::isPointIn(myBtnPrev, theCursor)) {
@@ -1169,7 +1233,7 @@
 } else if(::isPointIn(myBtnSwapLR, theCursor)) {
 size_t aLngId = myImage->params.swapLR->getValue() ? SWAP_LR_ON : SWAP_LR_OFF;
 myDescr->setText(tr(aLngId));
- } else if(::isPointIn(myBtnPlayList, theCursor)) {
+ } else if(::isPointIn(myBtnList, theCursor)) {
 myDescr->setText(tr(PLAYLIST));
 } else if(::isPointIn(myBtnFull, theCursor)) {
 myDescr->setText(tr(FULLSCREEN));
@@ -1184,8 +1248,19 @@
 }
 myDescr->setText(tr(MENU_VIEW_PANORAMA) + "\n" + tr(aTrPano));
 } else {
- myDescr->setOpacity(0.0f, true);
+ myDescr->setText("");
+ }
+
+ if(wasEmpty
+ && aStillTime < 1.0) {
+ myDescr->setText("");
+ } else if(getFocus() != NULL
+ || (myMenuRoot != NULL && myMenuRoot->isActive())) {
+ // hide within active dialog - should be replaced by z-layer check
+ myDescr->setText("");
 }
+
+ myDescr->setOpacity(!myDescr->getText().isEmpty() ? 1.0f : 0.0f, true);
 }
 }

sview-15_10.tar.gz/StImageViewer/StImageViewerGUI.h -> sview-15_11.tar.gz/StImageViewer/StImageViewerGUI.h Changed

@@ -37,6 +37,8 @@
 class StGLMsgStack;
 class StGLFpsLabel;
 class StGLTable;
+class StGLPlayList;
+class StPlayList;
 class StWindow;
 
 /**
@@ -89,6 +91,7 @@
 ST_LOCAL StImageViewerGUI(StImageViewer* thePlugin,
 StWindow* theWindow,
 StTranslations* theLangMap,
+ const StHandle<StPlayList>& thePlayList,
 const StHandle<StGLTextureQueue>& theTextureQueue);
 ST_LOCAL virtual ~StImageViewerGUI();
 ST_LOCAL virtual void stglUpdate(const StPointD_t& pointZo);
@@ -96,7 +99,6 @@
 ST_LOCAL virtual void stglDraw(unsigned int theView);
 
 ST_LOCAL void setVisibility(const StPointD_t& theCursor,
- bool isMouseActive,
 bool toForceHide);
 
 public:
@@ -131,7 +133,7 @@
 /**
 * Create normal (desktop) interface.
 */
- ST_LOCAL void createDesktopUI();
+ ST_LOCAL void createDesktopUI(const StHandle<StPlayList>& thePlayList);
 
 /**
 * Create upper tool-bar.
@@ -162,7 +164,7 @@
 /**
 * Create mobile interface.
 */
- ST_LOCAL void createMobileUI();
+ ST_LOCAL void createMobileUI(const StHandle<StPlayList>& thePlayList);
 
 ST_LOCAL void createMobileUpperToolbar();
 ST_LOCAL void createMobileBottomToolbar();
@@ -201,6 +203,7 @@
 StGLImageRegion* myImage; //!< the main image
 StGLDescription* myDescr; //!< description text shown near mouse cursor
 StGLMsgStack* myMsgStack; //!< messages stack
+ StGLPlayList* myPlayList;
 
 StGLMenu* myMenuRoot; //!< main menu
 
@@ -213,8 +216,8 @@
 StGLTextureButton* myBtnSwapLR;
 StGLCheckboxTextured* myBtnPanorama;
 StGLTextureButton* myBtnSrcFrmt;
- StGLTextureButton* myBtnPlayList;
- StGLTextureButton* myBtnFull;
+ StGLTextureButton* myBtnList;
+ StGLCheckboxTextured* myBtnFull;
 StGLFpsLabel* myFpsWidget;
 
 StGLTable* myHKeysTable;

sview-15_10.tar.gz/StImageViewer/lang/chinese/StImageViewer.lng -> sview-15_11.tar.gz/StImageViewer/lang/chinese/StImageViewer.lng Changed

@@ -1,169 +1,169 @@
 # Chinese translation file for StImageViewer program
 # @author YSC
 --------
-1000="上一图片"
-1001="下一图片"
-1002="切换左/右"
-1003="还原切换左/右"
-1004="立体格式:"
-1015="打开另一图片"
-1028="显示/隐藏播放列表"
-1029="切换\n全屏/窗口模式"
-1100="文件"
-1101="打开图片->>"
-1102="另存为->>"
-1103="立体格式->>"
-1104="图片信息"
-1109="退出"
-1110="单一立体文件"
-1111="左+右文件"
-1130="自动侦测"
-1131="单画面"
-1132="对眼"
-1133="平行配对"
-1134="上/下 (右/左)"
-1135="上/下 (左/右)"
-1136="交错"
-1137="分色红/青"
-1138="分色绿/红+蓝"
-1139="分色黄/蓝"
-1142="双流"
-1200="查看"
-1201="立体输出->>"
-1202="全屏"
-1203="重置"
-1204="切换左/右"
-1205="显示比例->>"
-1206="光滑过滤->>"
-1207="图像调节->>"
-1208="表面处理->>"
-1210="立体"
-1211="左画面"
-1212="右画面"
-1213="平行配对"
-1214="对眼"
-1250="源格式"
-1251="重启维持"
-?1252="Heal anamorphic 1080p/720p"
-1260="接近"
-1261="线状"
-1270="重置默认"
-1271="亮度"
-1272="饱和度"
-1273="伽马"
-1280="平面"
-1281="球面"
-1282="圆柱"
-?1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1400="改变设备->>"
-1401="关于插件..."
-1402="显示 FPS"
-1403="同步"
-1500="帮助"
-1501="关于..."
-1502="更新检查->>"
-1503="许可"
-1504="语言 (Language)"
-1506="用户提示"
-1508="关于系统"
-1509="界面大小->>"
-?1510="Hotkeys"
-?1511="Settings"
-1520="现在"
-1521="每天"
-1522="每周"
-1523="每年"
-1524="绝不"
-1590="小"
-1591="正常"
-1592="大"
-1593="强制高解析 2X"
-2000="选择图片文件打开"
-2001="选择左画面图片打开"
-2002="选择右画面图片文件打开"
-2003="图像信息"
-2004="信息未获得"
-2005="文件删除"
-2006="确定完全移除吗?"
-2007="激活解码器:"
-2008="确定将元数据保存到文件吗?"
-2009="元数据只能保存到JPEG文件."
-2010="选择保存快照位置"
-2011="什么也没有保存!"
-2012="快照不为空!"
-?2013="Assign new Hot Key for action\n{0}"
-?2014="Conflicts with: {0}"
-3000="sView - Image Viewer"
-3001="版本"
-3002="Image viewer allows you to open stereoscopic images in formats JPEG, PNG, MPO and a lot of others.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0"
-3003="官网www.sview.ru有新版本软件.\n请升级."
-3004="系统信息"
-4000="关闭"
-4001="取消"
-4006="保存"
-4007="删除"
-?4008="Default"
-?4009="Defaults"
-?4010="Assign"
-5000="[左]"
-5001="[右]"
-5002="文件名字(s)"
-5003="视频大小"
-5004="装载时间"
-5005="ms"
-5006="像素比率"
-5007="像素格式"
-5008="（不存储在元数据）"
-5009="（不匹配的元数据）"
-5011="（不存储在元数据中，\n但检测到文件名称）"
-5100="JPEG 说明"
-5101="JPS 说明"
-5200="相机生产商"
-5201="相机型号"
-5202="用户说明"
-5203="图像时间戳"
-6000="切换\n全屏/窗口模式"
-6001="显示 FPS"
-6002="立体格式: 自动侦测"
-6003="立体格式: 单画面"
-6004="立体格式: 上/下"
-6005="立体格式: 对眼"
-?6006="Show file info"
-?6007="Playlist - Go to the first item"
-?6008="Playlist - Go to the last item"
-6009="播放上一文件"
-6010="播放下一文件"
-?6011="Playlist - Start/stop slideshow"
-6012="另存为 PNG"
-6013="另存为 JPEG"
-?6014="Save file metadata"
-?6015="Delete the file from file system"
-?6016="Reset image adjustment"
-?6017="Reset image position"
-6018="切换左/右"
-?6019="Gamma correction - decrease"
-?6020="Gamma correction - increase"
-?6021="DX separation - decrease"
-?6022="DX separation - increase"
-?6023="DY separation - decrease"
-?6024="DY separation - increase"
-?6025="Angular separation - decrease"
-?6026="Angular separation - increase"
-?6027="Rotate 90 degrees counterclockwise"
-?6028="Rotate 90 degrees clockwise"
-?6029="Rotate counterclockwise"
-?6030="Rotate clockwise"
-?6031="Select next view mode"
-?6032="Panning - navigate to the left"
-?6033="Panning - navigate to the right"
-?6034="Panning - navigate to the top"
-?6035="Panning - navigate to the bottom"
-?6036="Scale - increment"
-?6037="Scale - decrement"
-?6038="Y Rotation - left"
-?6039="Y Rotation - right"
-?6040="X Rotation - up"
-?6041="X Rotation - down"
-?6042="Enable/disable panorama mode"
+1000=上一图片
+1001=下一图片
+1002=切换左/右
+1003=还原切换左/右
+1004=立体格式:
+1015=打开另一图片
+1028=显示/隐藏播放列表
+1029=切换\n全屏/窗口模式
+1100=文件
+1101=打开图片
+1102=另存为
+1103=立体格式
+1104=图片信息
+1109=退出
+1110=单一立体文件
+1111=左+右文件
+1130=自动侦测
+1131=单画面
+1132=对眼
+1133=平行配对
+1134=上/下 (右/左)
+1135=上/下 (左/右)
+1136=交错
+1137=分色红/青
+1138=分色绿/红+蓝
+1139=分色黄/蓝
+1142=双流
+1200=查看
+1201=立体输出
+1202=全屏
+1203=重置
+1204=切换左/右
+1205=显示比例
+1206=光滑过滤
+1207=图像调节
+1208=表面处理
+1210=立体
+1211=左画面
+1212=右画面
+1213=平行配对
+1214=对眼
+1250=源格式
+1251=重启维持
+?1252=Heal anamorphic 1080p/720p
+1260=接近
+1261=线状
+1270=重置默认
+1271=亮度
+1272=饱和度
+1273=伽马
+1280=平面
+1281=球面
+1282=圆柱
+?1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1400=改变设备
+1401=关于插件...
+1402=显示 FPS
+1403=同步
+1500=帮助
+1501=关于...
+1502=更新检查
+1503=许可
+1504=语言 (Language)
+1506=用户提示
+1508=关于系统
+1509=界面大小
+?1510=Hotkeys
+?1511=Settings
+1520=现在
+1521=每天
+1522=每周
+1523=每年
+1524=绝不
+1590=小
+1591=正常
+1592=大
+1593=强制高解析 2X
+2000=选择图片文件打开
+2001=选择左画面图片打开
+2002=选择右画面图片文件打开
+2003=图像信息
+2004=信息未获得
+2005=文件删除
+2006=确定完全移除吗?
+2007=激活解码器:
+2008=确定将元数据保存到文件吗?
+2009=元数据只能保存到JPEG文件.
+2010=选择保存快照位置
+2011=什么也没有保存!
+2012=快照不为空!
+?2013=Assign new Hot Key for action\n{0}
+?2014=Conflicts with: {0}
+3000=sView - Image Viewer
+3001=版本
+3002=Image viewer allows you to open stereoscopic images in formats JPEG, PNG, MPO and a lot of others.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0
+3003=官网www.sview.ru有新版本软件.\n请升级.
+3004=系统信息
+4000=关闭
+4001=取消
+4006=保存
+4007=删除
+?4008=Default
+?4009=Defaults
+?4010=Assign
+5000=[左]
+5001=[右]
+5002=文件名字(s)
+5003=视频大小
+5004=装载时间
+5005=ms
+5006=像素比率
+5007=像素格式
+5008=（不存储在元数据）
+5009=（不匹配的元数据）
+5011=（不存储在元数据中，\n但检测到文件名称）
+5100=JPEG 说明
+5101=JPS 说明
+5200=相机生产商
+5201=相机型号
+5202=用户说明
+5203=图像时间戳
+6000=切换\n全屏/窗口模式
+6001=显示 FPS
+6002=立体格式: 自动侦测
+6003=立体格式: 单画面
+6004=立体格式: 上/下
+6005=立体格式: 对眼
+?6006=Show file info
+?6007=Playlist - Go to the first item
+?6008=Playlist - Go to the last item
+6009=播放上一文件
+6010=播放下一文件
+?6011=Playlist - Start/stop slideshow
+6012=另存为 PNG
+6013=另存为 JPEG
+?6014=Save file metadata
+?6015=Delete the file from file system
+?6016=Reset image adjustment
+?6017=Reset image position
+6018=切换左/右
+?6019=Gamma correction - decrease
+?6020=Gamma correction - increase
+?6021=DX separation - decrease
+?6022=DX separation - increase
+?6023=DY separation - decrease
+?6024=DY separation - increase
+?6025=Angular separation - decrease
+?6026=Angular separation - increase
+?6027=Rotate 90 degrees counterclockwise
+?6028=Rotate 90 degrees clockwise
+?6029=Rotate counterclockwise
+?6030=Rotate clockwise
+?6031=Select next view mode
+?6032=Panning - navigate to the left
+?6033=Panning - navigate to the right
+?6034=Panning - navigate to the top
+?6035=Panning - navigate to the bottom
+?6036=Scale - increment
+?6037=Scale - decrement
+?6038=Y Rotation - left
+?6039=Y Rotation - right
+?6040=X Rotation - up
+?6041=X Rotation - down
+?6042=Enable/disable panorama mode

sview-15_10.tar.gz/StImageViewer/lang/english/StImageViewer.lng -> sview-15_11.tar.gz/StImageViewer/lang/english/StImageViewer.lng Changed

@@ -1,169 +1,169 @@
 # English translation file for StImageViewer program
 # @author Kirill Gavrilov
 --------
-1000="Previous image"
-1001="Next image"
-1002="Swap Left/Right"
-1003="UnSwap Left/Right"
-1004="Stereoscopic format:"
-1015="Open another image"
-1028="Show/Hide playlist"
-1029="Switch\nfullscreen/windowed"
-1100="Media"
-1101="Open Image..."
-1102="Save Image As..."
-1103="Stereoscopic format"
-1104="Image info"
-1109="Quit"
-1110="From One file"
-1111="Left+Right files"
-1130="Source"
-1131="Mono"
-1132="Cross-eyed"
-1133="Parallel Pair"
-1134="Over/Under (R/L)"
-1135="Over/Under (L/R)"
-1136="Interlaced"
-1137="Anaglyph Red/Cyan"
-1138="Anaglyph Green/Red+Blue"
-1139="Anaglyph Yellow/Blue"
-1142="2 Streams"
-1200="View"
-1201="Stereo Output"
-1202="Fullscreen"
-1203="Reset"
-1204="Swap Left/Right"
-1205="Display Ratio"
-1206="Smooth Filter"
-1207="Image Adjust"
-1208="Panorama"
-1210="Stereo"
-1211="Left View"
-1212="Right View"
-1213="Parallel Pair"
-1214="Cross-eyed"
-1250="Source"
-1251="Keep on restart"
-1252="Heal anamorphic 1080p/720p"
-1260="Nearest"
-1261="Linear"
-1270="Reset to defaults"
-1271="Brightness"
-1272="Saturation"
-1273="Gamma"
-1280="Off"
-1281="Sphere"
-1282="Cylinder"
-1283="Cubemap"
-1285="Track orientation"
-1286="Track orientation (poor)"
-1400="Change device"
-1401="About Plugin..."
-1402="Show FPS"
-1403="VSync"
-1500="Help"
-1501="About..."
-1502="Check for updates"
-1503="License text"
-1504="Language"
-1506="User tips"
-1508="About system"
-1509="Interface Scale"
-1510="Hotkeys"
-1511="Settings"
-1520="Now"
-1521="Each day"
-1522="Each week"
-1523="Each year"
-1524="Never"
-1590="Small"
-1591="Normal"
-1592="Big"
-1593="Force HiDPI 2X"
-2000="Choose the image file to open"
-2001="Choose LEFT image file to open"
-2002="Choose RIGHT image file to open"
-2003="Image Info"
-2004="Information is unavailable"
-2005="File deletion"
-2006="Do you really want to completely remove this file?"
-2007="File metadata saving"
-2008="Do you really want to save metadata to the file?"
-2009="Metadata can be saved only into JPEG files."
-2010="Choose location to save snapshot"
-2011="Nothing to save!"
-2012="Snapshot not available!"
-2013="Assign new Hot Key for action\n{0}"
-2014="Conflicts with: {0}"
-3000="sView - Image Viewer"
-3001="version"
-3002="Image viewer allows you to open stereoscopic images in formats JPEG, PNG, MPO and a lot of others.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0"
-3003="A new version of sView is available on the official site www.sview.ru.\nPlease update your program."
-3004="System Info"
-4000="Close"
-4001="Cancel"
-4006="Save"
-4007="Delete"
-4008="Default"
-4009="Defaults"
-4010="Assign"
-5000="[left]"
-5001="[right]"
-5002="File name"
-5003="Dimensions"
-5004="Load time"
-5005="ms"
-5006="Pixel ratio"
-5007="Color model"
-5008="(does not stored in metadata)"
-5009="(does not match metadata)"
-5011="(does not stored in metadata,\nbut detected from file name)"
-5100="JPEG Comment"
-5101="JPS Comment"
-5200="Camera Maker"
-5201="Camera Model"
-5202="User Comment"
-5203="Image timestamp"
-6000="Switch fullscreen/windowed"
-6001="Show/hide FPS meter"
-6002="Stereo format - Auto"
-6003="Stereo format - Mono"
-6004="Stereo format - Over/Under"
-6005="Stereo format - Side by side"
-6006="Show file info"
-6007="Playlist - Go to the first item"
-6008="Playlist - Go to the last item"
-6009="Playlist - Go to the previous item"
-6010="Playlist - Go to the next item"
-6011="Playlist - Start/stop slideshow"
-6012="Save in PNG format"
-6013="Save in JPEG format"
-6014="Save file metadata"
-6015="Delete the file from file system"
-6016="Reset image adjustment"
-6017="Reset image position"
-6018="Swap Left/Right"
-6019="Gamma correction - decrease"
-6020="Gamma correction - increase"
-6021="DX separation - decrease"
-6022="DX separation - increase"
-6023="DY separation - decrease"
-6024="DY separation - increase"
-6025="Angular separation - decrease"
-6026="Angular separation - increase"
-6027="Rotate 90 degrees counterclockwise"
-6028="Rotate 90 degrees clockwise"
-6029="Rotate counterclockwise"
-6030="Rotate clockwise"
-6031="Select next view mode"
-6032="Panning - navigate to the left"
-6033="Panning - navigate to the right"
-6034="Panning - navigate to the top"
-6035="Panning - navigate to the bottom"
-6036="Scale - increment"
-6037="Scale - decrement"
-6038="Y Rotation - left"
-6039="Y Rotation - right"
-6040="X Rotation - up"
-6041="X Rotation - down"
-6042="Enable/disable panorama mode"
+1000=Previous image
+1001=Next image
+1002=Swap Left/Right
+1003=UnSwap Left/Right
+1004=Stereoscopic format:
+1015=Open another image
+1028=Show/Hide playlist
+1029=Switch\nfullscreen/windowed
+1100=Media
+1101=Open Image...
+1102=Save Image As...
+1103=Stereoscopic format
+1104=Image info
+1109=Quit
+1110=From One file
+1111=Left+Right files
+1130=Source
+1131=Mono
+1132=Cross-eyed
+1133=Parallel Pair
+1134=Over/Under (R/L)
+1135=Over/Under (L/R)
+1136=Interlaced
+1137=Anaglyph Red/Cyan
+1138=Anaglyph Green/Red+Blue
+1139=Anaglyph Yellow/Blue
+1142=2 Streams
+1200=View
+1201=Stereo Output
+1202=Fullscreen
+1203=Reset
+1204=Swap Left/Right
+1205=Display Ratio
+1206=Smooth Filter
+1207=Image Adjust
+1208=Panorama
+1210=Stereo
+1211=Left View
+1212=Right View
+1213=Parallel Pair
+1214=Cross-eyed
+1250=Source
+1251=Keep on restart
+1252=Heal anamorphic 1080p/720p
+1260=Nearest
+1261=Linear
+1270=Reset to defaults
+1271=Brightness
+1272=Saturation
+1273=Gamma
+1280=Off
+1281=Sphere
+1282=Cylinder
+1283=Cubemap
+1285=Track orientation
+1286=Track orientation (poor)
+1400=Change device
+1401=About Plugin...
+1402=Show FPS
+1403=VSync
+1500=Help
+1501=About...
+1502=Check for updates
+1503=License text
+1504=Language
+1506=User tips
+1508=About system
+1509=Interface Scale
+1510=Hotkeys
+1511=Settings
+1520=Now
+1521=Each day
+1522=Each week
+1523=Each year
+1524=Never
+1590=Small
+1591=Normal
+1592=Big
+1593=Force HiDPI 2X
+2000=Choose the image file to open
+2001=Choose LEFT image file to open
+2002=Choose RIGHT image file to open
+2003=Image Info
+2004=Information is unavailable
+2005=File deletion
+2006=Do you really want to completely remove this file?
+2007=File metadata saving
+2008=Do you really want to save metadata to the file?
+2009=Metadata can be saved only into JPEG files.
+2010=Choose location to save snapshot
+2011=Nothing to save!
+2012=Snapshot not available!
+2013=Assign new Hot Key for action\n{0}
+2014=Conflicts with: {0}
+3000=sView - Image Viewer
+3001=version
+3002=Image viewer allows you to open stereoscopic images in formats JPEG, PNG, MPO and a lot of others.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0
+3003=A new version of sView is available on the official site www.sview.ru.\nPlease update your program.
+3004=System Info
+4000=Close
+4001=Cancel
+4006=Save
+4007=Delete
+4008=Default
+4009=Defaults
+4010=Assign
+5000=[left]
+5001=[right]
+5002=File name
+5003=Dimensions
+5004=Load time
+5005=ms
+5006=Pixel ratio
+5007=Color model
+5008=(does not stored in metadata)
+5009=(does not match metadata)
+5011=(does not stored in metadata,\nbut detected from file name)
+5100=JPEG Comment
+5101=JPS Comment
+5200=Camera Maker
+5201=Camera Model
+5202=User Comment
+5203=Image timestamp
+6000=Switch fullscreen/windowed
+6001=Show/hide FPS meter
+6002=Stereo format - Auto
+6003=Stereo format - Mono
+6004=Stereo format - Over/Under
+6005=Stereo format - Side by side
+6006=Show file info
+6007=Playlist - Go to the first item
+6008=Playlist - Go to the last item
+6009=Playlist - Go to the previous item
+6010=Playlist - Go to the next item
+6011=Playlist - Start/stop slideshow
+6012=Save in PNG format
+6013=Save in JPEG format
+6014=Save file metadata
+6015=Delete the file from file system
+6016=Reset image adjustment
+6017=Reset image position
+6018=Swap Left/Right
+6019=Gamma correction - decrease
+6020=Gamma correction - increase
+6021=DX separation - decrease
+6022=DX separation - increase
+6023=DY separation - decrease
+6024=DY separation - increase
+6025=Angular separation - decrease
+6026=Angular separation - increase
+6027=Rotate 90 degrees counterclockwise
+6028=Rotate 90 degrees clockwise
+6029=Rotate counterclockwise
+6030=Rotate clockwise
+6031=Select next view mode
+6032=Panning - navigate to the left
+6033=Panning - navigate to the right
+6034=Panning - navigate to the top
+6035=Panning - navigate to the bottom
+6036=Scale - increment
+6037=Scale - decrement
+6038=Y Rotation - left
+6039=Y Rotation - right
+6040=X Rotation - up
+6041=X Rotation - down
+6042=Enable/disable panorama mode

sview-15_10.tar.gz/StImageViewer/lang/french/StImageViewer.lng -> sview-15_11.tar.gz/StImageViewer/lang/french/StImageViewer.lng Changed

@@ -1,169 +1,169 @@
 # French translation file for StImageViewer program
 # @author gramoun for Kirill Gavrilov
 --------
-1000="Image Précédente"
-1001="Image Suivante"
-1002="Gauche/Droite inversé"
-1003="Gauche/Droite normal"
-1004="Format entrée:"
-1015="Ouvre autre image"
-1028="Affiche/Masque playlist"
-1029="Bascule\Plein écran/fenêtre"
-1100="Média"
-1101="Ouvre Image..."
-1102="Enregistre Image Sous.."
-1103="Format Stéréo d'entrée"
-1104="Image info"
-1109="Quitter"
-1110="Depuis un fichier"
-1111="2 Fichiers Gauche+Droit"
-1130="Source"
-1131="Mono"
-1132="Cross-eyed"
-1133="Coté/Coté (SbS)"
-1134="Dessus/Dessous(D/G)"
-1135="Dessus/Dessous(G/D)"
-1136="Entrelacé"
-1137="Anaglyphe Rouge/Bleu"
-1138="Anaglyphe Vert/Magenta"
-1139="Anaglyphe Jaune/Bleu"
-1142="2 Streams"
-1200="Affichage"
-1201="Sortie Stéréo"
-1202="Plein Ecran"
-1203="Réinitialisation"
-1204="Inverser Gauche/Droite"
-1205="Ratio d'affichage"
-1206="Lissage antialiasing"
-1207="Réglage de l'image"
-1208="Panorama"
-1210="Stéréo"
-1211="Vue Gauche"
-1212="Vue Droite"
-1213="Coté/Coté (SbS)"
-1214="Cross-eyed"
-1250="Source"
-1251="Garder après redémarrage"
-?1252="Heal anamorphic 1080p/720p"
-1260="Plus proche"
-1261="Lineaire"
-1270="Rétablir par défaut"
-1271="Brightness"
-1272="Saturation"
-1273="Gamma"
-1280="Plan"
-1281="Sphère"
-1282="Cylindre"
-1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1400="Changer la sortie"
-1401="A propos du Plugin..."
-1402="Voir I/S"
-1403="Synchro Vert."
-1500="Aide"
-1501="A Propos..."
-1502="Vérifier nouvelle version"
-1503="Texte de la Licence"
-1504="Language"
-1506="Conseils d'utilisation"
-?1508="About system"
-?1509="Scale Interface"
-1510="Raccourcis"
-1511="Paramètres"
-1520="Maintenant"
-1521="Chaque Jour"
-1522="Chaque Mois"
-1523="Chaque Année"
-1524="Jamais"
-1590="Petit"
-1591="Normal"
-1592="Gros"
-1593="Force HiDPI 2X"
-2000="Choix du fichier image à ouvrir"
-2001="Choix du fichier image Gauche à ouvrir"
-2002="Choix du fichier image Droite à ouvrir"
-2003="Info de l'image"
-2004="L'information est indisponible"
-?2005="File deletion"
-?2006="Do you really want to completely remove this file?"
-?2007="File metadata saving"
-?2008="Do you really want to save metadata to the file?"
-?2009="Metadata can be saved only into JPEG files."
-2010="Emplacement de la capture écran"
-2011="Rien à enregistrer!"
-2012="Capture non disponible!"
-2013="Changement raccourcu clavier pour\n{0}"
-?2014="Conflicts with: {0}"
-3000="sView - Image Viewer"
-3001="version"
-3002="Image viewer vous permet d'ouvrir des images stéréoscopiques en formats JPEG, PNG, MPO.\n © {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}\n\nThis program is distributed under GPL3.0"
-3003="Une nouvelle version de sView est disponible sur le site officiel www.sview.ru.\nSVP, mettez votre programme à jour."
-3004="Informations sur le système"
-4000="Fermer"
-4001="Annuler"
-4006="Enregistre"
-4007="Supprimer"
-?4008="Default"
-?4009="Defaults"
-4010="Affecter"
-5000="[gauche]"
-5001="[droite]"
-5002="Nom de fichier"
-5003="Résolution"
-5004="Temps de démarrage"
-5005="ms"
-5006="Pixel ratio"
-5007="Modèle colorimétrique"
-?5008="(does not stored in metadata)"
-?5009="(does not match metadata)"
-?5011="(does not stored in metadata,\nbut detected from file name)"
-5100="JPEG commentaire"
-5101="JPS commentaire"
-5200="Camera Maker"
-5201="Camera Model"
-5202="User Comment"
-5203="Image timestamp"
-6000="Bascule\Plein écran/fenêtre"
-6001="Voir I/S"
-6002="Format Stéréo d'entrée - Auto-détection"
-6003="Format Stéréo d'entrée - Mono"
-6004="Format Stéréo d'entrée - Dessus/Dessous"
-6005="Format Stéréo d'entrée - Coté/Coté (SbS)"
-6006="Afficher les informations sur le fichier"
-6007="Playlist - Aller au premier élément"
-6008="Playlist - Aller au dernier élément"
-6009="Playlist - Aller à l'élément précédent"
-6010="Playlist - Aller à l'élément suivant"
-6011="Playlist - Lancer / arrêter le diaporama"
-6012="Enregistrer au format PNG"
-6013="Enregistrer au format JPEG"
-6014="Enregistrer les métadonnées d'un fichier"
-6015="Supprimer le fichier du système de fichiers"
-6016="Réinitialiser réglage de l'image"
-6017="Réinitialiser position de l'image"
-6018="Inverser Gauche/Droite"
-?6019="Gamma correction - decrease"
-?6020="Gamma correction - increase"
-?6021="DX separation - decrease"
-?6022="DX separation - increase"
-?6023="DY separation - decrease"
-?6024="DY separation - increase"
-?6025="Angular separation - decrease"
-?6026="Angular separation - increase"
-6027="Faire pivoter un objet de 90 degrés vers la gauche"
-6028="Faire pivoter un objet de 90 degrés vers la droite"
-6029="Sens inverse des aiguilles d’une montre"
-6030="Sens des aiguilles d’une montre"
-?6031="Select next view mode"
-6032="Naviguer vers la gauche"
-6033="Naviguer vers la droite"
-6034="Naviguer vers le haut"
-6035="Naviguer vers le bas"
-6036="Zoom"
-6037="Dézoomer"
-?6038="Y Rotation - left"
-?6039="Y Rotation - right"
-?6040="X Rotation - up"
-?6041="X Rotation - down"
-6042="Activer / désactiver le mode panorama"
+1000=Image Précédente
+1001=Image Suivante
+1002=Gauche/Droite inversé
+1003=Gauche/Droite normal
+1004=Format entrée:
+1015=Ouvre autre image
+1028=Affiche/Masque playlist
+1029=Bascule\Plein écran/fenêtre
+1100=Média
+1101=Ouvre Image...
+1102=Enregistre Image Sous..
+1103=Format Stéréo d'entrée
+1104=Image info
+1109=Quitter
+1110=Depuis un fichier
+1111=2 Fichiers Gauche+Droit
+1130=Source
+1131=Mono
+1132=Cross-eyed
+1133=Coté/Coté (SbS)
+1134=Dessus/Dessous(D/G)
+1135=Dessus/Dessous(G/D)
+1136=Entrelacé
+1137=Anaglyphe Rouge/Bleu
+1138=Anaglyphe Vert/Magenta
+1139=Anaglyphe Jaune/Bleu
+1142=2 Streams
+1200=Affichage
+1201=Sortie Stéréo
+1202=Plein Ecran
+1203=Réinitialisation
+1204=Inverser Gauche/Droite
+1205=Ratio d'affichage
+1206=Lissage antialiasing
+1207=Réglage de l'image
+1208=Panorama
+1210=Stéréo
+1211=Vue Gauche
+1212=Vue Droite
+1213=Coté/Coté (SbS)
+1214=Cross-eyed
+1250=Source
+1251=Garder après redémarrage
+?1252=Heal anamorphic 1080p/720p
+1260=Plus proche
+1261=Lineaire
+1270=Rétablir par défaut
+1271=Brightness
+1272=Saturation
+1273=Gamma
+1280=Plan
+1281=Sphère
+1282=Cylindre
+1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1400=Changer la sortie
+1401=A propos du Plugin...
+1402=Voir I/S
+1403=Synchro Vert.
+1500=Aide
+1501=A Propos...
+1502=Vérifier nouvelle version
+1503=Texte de la Licence
+1504=Language
+1506=Conseils d'utilisation
+?1508=About system
+?1509=Scale Interface
+1510=Raccourcis
+1511=Paramètres
+1520=Maintenant
+1521=Chaque Jour
+1522=Chaque Mois
+1523=Chaque Année
+1524=Jamais
+1590=Petit
+1591=Normal
+1592=Gros
+1593=Force HiDPI 2X
+2000=Choix du fichier image à ouvrir
+2001=Choix du fichier image Gauche à ouvrir
+2002=Choix du fichier image Droite à ouvrir
+2003=Info de l'image
+2004=L'information est indisponible
+?2005=File deletion
+?2006=Do you really want to completely remove this file?
+?2007=File metadata saving
+?2008=Do you really want to save metadata to the file?
+?2009=Metadata can be saved only into JPEG files.
+2010=Emplacement de la capture écran
+2011=Rien à enregistrer!
+2012=Capture non disponible!
+2013=Changement raccourcu clavier pour\n{0}
+?2014=Conflicts with: {0}
+3000=sView - Image Viewer
+3001=version
+3002=Image viewer vous permet d'ouvrir des images stéréoscopiques en formats JPEG, PNG, MPO.\n © {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}\n\nThis program is distributed under GPL3.0
+3003=Une nouvelle version de sView est disponible sur le site officiel www.sview.ru.\nSVP, mettez votre programme à jour.
+3004=Informations sur le système
+4000=Fermer
+4001=Annuler
+4006=Enregistre
+4007=Supprimer
+?4008=Default
+?4009=Defaults
+4010=Affecter
+5000=[gauche]
+5001=[droite]
+5002=Nom de fichier
+5003=Résolution
+5004=Temps de démarrage
+5005=ms
+5006=Pixel ratio
+5007=Modèle colorimétrique
+?5008=(does not stored in metadata)
+?5009=(does not match metadata)
+?5011=(does not stored in metadata,\nbut detected from file name)
+5100=JPEG commentaire
+5101=JPS commentaire
+5200=Camera Maker
+5201=Camera Model
+5202=User Comment
+5203=Image timestamp
+6000=Bascule\Plein écran/fenêtre
+6001=Voir I/S
+6002=Format Stéréo d'entrée - Auto-détection
+6003=Format Stéréo d'entrée - Mono
+6004=Format Stéréo d'entrée - Dessus/Dessous
+6005=Format Stéréo d'entrée - Coté/Coté (SbS)
+6006=Afficher les informations sur le fichier
+6007=Playlist - Aller au premier élément
+6008=Playlist - Aller au dernier élément
+6009=Playlist - Aller à l'élément précédent
+6010=Playlist - Aller à l'élément suivant
+6011=Playlist - Lancer / arrêter le diaporama
+6012=Enregistrer au format PNG
+6013=Enregistrer au format JPEG
+6014=Enregistrer les métadonnées d'un fichier
+6015=Supprimer le fichier du système de fichiers
+6016=Réinitialiser réglage de l'image
+6017=Réinitialiser position de l'image
+6018=Inverser Gauche/Droite
+?6019=Gamma correction - decrease
+?6020=Gamma correction - increase
+?6021=DX separation - decrease
+?6022=DX separation - increase
+?6023=DY separation - decrease
+?6024=DY separation - increase
+?6025=Angular separation - decrease
+?6026=Angular separation - increase
+6027=Faire pivoter un objet de 90 degrés vers la gauche
+6028=Faire pivoter un objet de 90 degrés vers la droite
+6029=Sens inverse des aiguilles d’une montre
+6030=Sens des aiguilles d’une montre
+?6031=Select next view mode
+6032=Naviguer vers la gauche
+6033=Naviguer vers la droite
+6034=Naviguer vers le haut
+6035=Naviguer vers le bas
+6036=Zoom
+6037=Dézoomer
+?6038=Y Rotation - left
+?6039=Y Rotation - right
+?6040=X Rotation - up
+?6041=X Rotation - down
+6042=Activer / désactiver le mode panorama

sview-15_10.tar.gz/StImageViewer/lang/german/StImageViewer.lng -> sview-15_11.tar.gz/StImageViewer/lang/german/StImageViewer.lng Changed

@@ -1,169 +1,169 @@
 # German translation file for StImageViewer program
 # @author Kirill Gavrilov
 --------
-1000="Vorheriges Bild"
-1001="Nachstes Bild"
-1002="L&R Vertauschen An"
-1003="L&R Vertauschen Aus"
-1004="Quellformat:"
-1015="Öffnen anderen Bild"
-1028="Anzeigen/ausblenden Wiedergabeliste"
-1029="Vollbildmodus/Fenstermodus"
-1100="Medien"
-1101="Bild öffnen..."
-1102="Bild speichern als..."
-1103="Quelle Stereo-Format"
-1104="Bildinfo"
-1109="Beenden"
-1110="Einer Datei"
-1111="Zwei Dateien"
-1130="Quelle"
-1131="Mono"
-1132="Schielend"
-1133="Parallel Pair"
-1134="Over/Under (R/L)"
-1135="Over/Under (L/R)"
-1136="Interlaced"
-1137="Anaglyph Rot/Cyan"
-1138="Anaglyph Grün/Rot+Blau"
-1139="Anaglyph Gelb/Blau"
-1142="2 Streams"
-1200="Ansicht"
-1201="Stereo-Ausgang"
-1202="Vollbild"
-1203="Zurückstellen"
-1204="L&R Vertauschen"
-1205="Seitenverhältnis"
-1206="Glatte Filter"
-1207="Bildeinstellung"
-1208="Panorama"
-1210="Stereo"
-1211="Linke Bild"
-1212="Rechte Bild"
-1213="Parallel Pair"
-1214="Cross-eyed"
-1250="Quelle"
-1251="Halten beim Neustart"
-?1252="Heal anamorphic 1080p/720p"
-1260="Nearest"
-1261="Linear"
-1270="Auf Standardwerte zurücksetzen"
-1271="Helligkeit"
-1272="Sättigung"
-1273="Gamma"
-1280="Aus"
-1281="Kugel"
-1282="Zylinder"
-1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1400="Gerät ändern"
-1401="Über Plugin..."
-1402="FPS anzeigen"
-1403="VSync"
-1500="Hilfe"
-1501="Über..."
-1502="Nach Updates suchen"
-1503="Lizenztext"
-1504="Language"
-1506="Anwendertipps"
-1508="Über System"
-1509="Maßstab Benutzeroberfläche"
-1510="Hotkeys"
-1511="Einstellungen"
-1520="jetzt"
-1521="täglich"
-1522="wöchentlich"
-1523="jährlich"
-1524="nie"
-1590="klein"
-1591="normal"
-1592="groß"
-1593="erzwingen HiDPI 2X"
-2000="Wählen die Bilddatei zu öffnen"
-2001="Wählen die linke Bilddatei zu öffnen"
-2002="Wählen die rechte Bilddatei zu öffnen"
-2003="Bildinfo"
-2004="Information nicht verfügbar"
-2005="Löschen von Dateien"
-?2006="Do you really want to completely remove this file?"
-?2007="File metadata saving"
-?2008="Do you really want to save metadata to the file?"
-?2009="Metadata can be saved only into JPEG files."
-2010="Wählen einen Speicherort für Schnappschuss"
-2011="Nichts zu speichern!"
-2012="Schnappschuss ist nicht verfügbar!"
-2013="Hotkey ändern\n{0}"
-2014="Konflikten: {0}"
-3000="sView - Image Viewer"
-3001="Version"
-?3002="Image viewer allows you to open stereoscopic images in formats JPEG, PNG, MPO and a lot of others.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0"
-?3003="A new version of sView is available on the official site www.sview.ru.\nPlease update your program."
-3004="System Info"
-4000="Schließen"
-4001="Abbrechen"
-4006="Speichern"
-4007="Löschen"
-4008="Default"
-4009="Defaults"
-4010="Zuweisen"
-5000="[linke]"
-5001="[rechte]"
-5002="Dateiname"
-5003="Auflösung"
-5004="Ladezeit"
-5005="ms"
-5006="Pixelseitenverhältnis"
-5007="Farbmodell"
-5008="(nicht in Metadaten gespeichert)"
-5009="(keine Metadaten übereinstimmen)"
-5011="(nicht in Metadaten gespeichert,\nsondern von Dateinamen detektiert)"
-5100="JPEG Kommentar"
-5101="JPS Kommentar"
-5200="Kamerahersteller"
-5201="Kameramodell"
-5202="User Kommentar"
-5203="Bild-Zeitstempel"
-6000="Vollbildmodus/Fenstermodus"
-6001="FPS anzeigen"
-6002="Stereo-Format - Autoerkennung"
-6003="Stereo-Format - Mono"
-6004="Stereo-Format - Over/Under"
-6005="Stereo-Format - Side by side"
-6006="Datei info"
-6007="Wiedergabeliste - Zum ersten Element"
-6008="Wiedergabeliste - Zum letzten Element"
-6009="Wiedergabeliste - Zum vorherigen Element"
-6010="Wiedergabeliste - Zum nächsten Element"
-6011="Wiedergabeliste - Diashow starten / stoppen"
-6012="Speichern im PNG-Format"
-6013="Speichern im JPEG-Format"
-6014="Datei-Metadaten speichern"
-6015="Die Datei löschen aus dem Dateisystem"
-6016="Zurücksetzen Bildeinstellung"
-6017="Zurücksetzen Bildposition"
-6018="L&R Vertauschen"
-6019="Gamma-Korrektur - verringern"
-6020="Gamma-Korrektur - erhöhen"
-6021="DX Trennung - verringern"
-6022="DX Trennung - erhöhen"
-6023="DY Trennung - verringern"
-6024="DY Trennung - erhöhen"
-6025="Winkelabstand - verringern"
-6026="Winkelabstand - erhöhen"
-6027="Um 90 Grad gegen Uhrzeigersinn drehen"
-6028="Um 90 Grad im Uhrzeigersinn drehen"
-6029="Drehen gegen den Uhrzeigersinn"
-6030="Im Uhrzeigersinn drehen"
-?6031="Select next view mode"
-6032="Navigieren nach links"
-6033="Navigieren nach rechts"
-6034="Navigieren nach oben"
-6035="Navigieren nach unten"
-6036="Zoomen"
-6037="Herauszoomen"
-6038="Y-Drehung - links"
-6039="Y-Drehung - rechts"
-6040="X-Drehung - nach oben"
-6041="X-Drehung - nach unten"
-6042="Aktivieren / Deaktivieren der Panorama-Modus"
+1000=Vorheriges Bild
+1001=Nachstes Bild
+1002=L&R Vertauschen An
+1003=L&R Vertauschen Aus
+1004=Quellformat:
+1015=Öffnen anderen Bild
+1028=Anzeigen/ausblenden Wiedergabeliste
+1029=Vollbildmodus/Fenstermodus
+1100=Medien
+1101=Bild öffnen...
+1102=Bild speichern als...
+1103=Quelle Stereo-Format
+1104=Bildinfo
+1109=Beenden
+1110=Einer Datei
+1111=Zwei Dateien
+1130=Quelle
+1131=Mono
+1132=Schielend
+1133=Parallel Pair
+1134=Over/Under (R/L)
+1135=Over/Under (L/R)
+1136=Interlaced
+1137=Anaglyph Rot/Cyan
+1138=Anaglyph Grün/Rot+Blau
+1139=Anaglyph Gelb/Blau
+1142=2 Streams
+1200=Ansicht
+1201=Stereo-Ausgang
+1202=Vollbild
+1203=Zurückstellen
+1204=L&R Vertauschen
+1205=Seitenverhältnis
+1206=Glatte Filter
+1207=Bildeinstellung
+1208=Panorama
+1210=Stereo
+1211=Linke Bild
+1212=Rechte Bild
+1213=Parallel Pair
+1214=Cross-eyed
+1250=Quelle
+1251=Halten beim Neustart
+?1252=Heal anamorphic 1080p/720p
+1260=Nearest
+1261=Linear
+1270=Auf Standardwerte zurücksetzen
+1271=Helligkeit
+1272=Sättigung
+1273=Gamma
+1280=Aus
+1281=Kugel
+1282=Zylinder
+1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1400=Gerät ändern
+1401=Über Plugin...
+1402=FPS anzeigen
+1403=VSync
+1500=Hilfe
+1501=Über...
+1502=Nach Updates suchen
+1503=Lizenztext
+1504=Language
+1506=Anwendertipps
+1508=Über System
+1509=Maßstab Benutzeroberfläche
+1510=Hotkeys
+1511=Einstellungen
+1520=jetzt
+1521=täglich
+1522=wöchentlich
+1523=jährlich
+1524=nie
+1590=klein
+1591=normal
+1592=groß
+1593=erzwingen HiDPI 2X
+2000=Wählen die Bilddatei zu öffnen
+2001=Wählen die linke Bilddatei zu öffnen
+2002=Wählen die rechte Bilddatei zu öffnen
+2003=Bildinfo
+2004=Information nicht verfügbar
+2005=Löschen von Dateien
+?2006=Do you really want to completely remove this file?
+?2007=File metadata saving
+?2008=Do you really want to save metadata to the file?
+?2009=Metadata can be saved only into JPEG files.
+2010=Wählen einen Speicherort für Schnappschuss
+2011=Nichts zu speichern!
+2012=Schnappschuss ist nicht verfügbar!
+2013=Hotkey ändern\n{0}
+2014=Konflikten: {0}
+3000=sView - Image Viewer
+3001=Version
+?3002=Image viewer allows you to open stereoscopic images in formats JPEG, PNG, MPO and a lot of others.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0
+?3003=A new version of sView is available on the official site www.sview.ru.\nPlease update your program.
+3004=System Info
+4000=Schließen
+4001=Abbrechen
+4006=Speichern
+4007=Löschen
+4008=Default
+4009=Defaults
+4010=Zuweisen
+5000=[linke]
+5001=[rechte]
+5002=Dateiname
+5003=Auflösung
+5004=Ladezeit
+5005=ms
+5006=Pixelseitenverhältnis
+5007=Farbmodell
+5008=(nicht in Metadaten gespeichert)
+5009=(keine Metadaten übereinstimmen)
+5011=(nicht in Metadaten gespeichert,\nsondern von Dateinamen detektiert)
+5100=JPEG Kommentar
+5101=JPS Kommentar
+5200=Kamerahersteller
+5201=Kameramodell
+5202=User Kommentar
+5203=Bild-Zeitstempel
+6000=Vollbildmodus/Fenstermodus
+6001=FPS anzeigen
+6002=Stereo-Format - Autoerkennung
+6003=Stereo-Format - Mono
+6004=Stereo-Format - Over/Under
+6005=Stereo-Format - Side by side
+6006=Datei info
+6007=Wiedergabeliste - Zum ersten Element
+6008=Wiedergabeliste - Zum letzten Element
+6009=Wiedergabeliste - Zum vorherigen Element
+6010=Wiedergabeliste - Zum nächsten Element
+6011=Wiedergabeliste - Diashow starten / stoppen
+6012=Speichern im PNG-Format
+6013=Speichern im JPEG-Format
+6014=Datei-Metadaten speichern
+6015=Die Datei löschen aus dem Dateisystem
+6016=Zurücksetzen Bildeinstellung
+6017=Zurücksetzen Bildposition
+6018=L&R Vertauschen
+6019=Gamma-Korrektur - verringern
+6020=Gamma-Korrektur - erhöhen
+6021=DX Trennung - verringern
+6022=DX Trennung - erhöhen
+6023=DY Trennung - verringern
+6024=DY Trennung - erhöhen
+6025=Winkelabstand - verringern
+6026=Winkelabstand - erhöhen
+6027=Um 90 Grad gegen Uhrzeigersinn drehen
+6028=Um 90 Grad im Uhrzeigersinn drehen
+6029=Drehen gegen den Uhrzeigersinn
+6030=Im Uhrzeigersinn drehen
+?6031=Select next view mode
+6032=Navigieren nach links
+6033=Navigieren nach rechts
+6034=Navigieren nach oben
+6035=Navigieren nach unten
+6036=Zoomen
+6037=Herauszoomen
+6038=Y-Drehung - links
+6039=Y-Drehung - rechts
+6040=X-Drehung - nach oben
+6041=X-Drehung - nach unten
+6042=Aktivieren / Deaktivieren der Panorama-Modus

sview-15_10.tar.gz/StImageViewer/lang/korean/StImageViewer.lng -> sview-15_11.tar.gz/StImageViewer/lang/korean/StImageViewer.lng Changed

@@ -2,169 +2,169 @@
 # @author Kirill Gavrilov
 # @translator Kwon Daesuk <hyntel@clunix.com>
 --------
-1000="앞 이미지"
-1001="다음 이미지"
-1002="좌/우 변경"
-1003="좌/우 복원"
-1004="소스 포맷:"
-1015="다른 이미지 열기"
-1028="재생 목록 보이기/감추기"
-1029="전환\n전체화면/윈도화면"
-1100="미디어"
-1101="이미지 열기..."
-1102="다른 이름으로 저장..."
-1103="입력 스테레오 형식"
-?1104="Image info"
-1109="나가기"
-1110="한 파일에서 열기"
-1111="좌+우 파일들에서 열기"
-1130="자동감지"
-1131="모노"
-1132="크로스-아이"
-1133="패럴렐 페어"
-1134="상/하(R/L)"
-1135="상/하(L/R)"
-?1136="Interlaced"
-?1137="Anaglyph Red/Cyan"
-?1138="Anaglyph Green/Red+Blue"
-?1139="Anaglyph Yellow/Blue"
-?1142="2 Streams"
-?1200="View"
-1201="입체 출력"
-1202="전체 화면"
-1203="리셋"
-1204="좌/우 변경"
-1205="화면 비율"
-?1206="Smooth Filter"
-1207="이미지 보정"
-?1208="Panorama"
-?1210="Stereo"
-?1211="Left View"
-?1212="Right View"
-1213="패럴렐 페어"
-1214="크로스-아이"
-?1250="Source"
-1251="재시작시 유지"
-?1252="Heal anamorphic 1080p/720p"
-?1260="Nearest"
-?1261="Linear"
-1270="기본값으로 리셋"
-1271="밝기"
-?1272="Saturation"
-1273="감마"
-?1280="Off"
-?1281="Sphere"
-?1282="Cylinder"
-?1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1400="장치 변경"
-?1401="About Plugin..."
-?1402="Show FPS"
-?1403="VSync"
-1500="도움말"
-1501="이 프로그램에 대해..."
-1502="업데이트 확인"
-1503="라이선스 문서"
-1504="언어 (Language)"
-1506="사용자 팁"
-?1508="About system"
-?1509="Interface Scale"
-?1510="Hotkeys"
-?1511="Settings"
-1520="지금"
-1521="매일Each day"
-1522="매주Each week"
-1523="매년Each year"
-1524="하지 않음Never"
-1590="작게 Small"
-1591="보통Normal"
-1592="크게 Big"
-1593="HiDPI 2X로"
-2000="열어볼 이미지 파일 선택"
-2001="왼쪽 이미지 선택"
-2002="오른쪽 이미지 선택"
-2003="Image Info"
-2004="Information is unavailable"
-2005="File deletion"
-2006="Do you really want to completely remove this file?"
-2007="File metadata saving"
-2008="Do you really want to save metadata to the file?"
-2009="Metadata can be saved only into JPEG files."
-2010="스냅샷 저장 위치 선택"
-2011="저장할 수 없음!"
-2012="스냅샷이 없음!"
-?2013="Assign new Hot Key for action\n{0}"
-?2014="Conflicts with: {0}"
-3000="sView - 이미지 뷰어"
-3001="version"
-3002="이 이미지 뷰어로 JPEG, PNG, MPO 외 다양한 양식의 스테레오 이미지를 볼 수 있습니다.\n © {0} Kirill Gavrilov <{1}>\n 공식 사이트: {2}\n\n이 프로그램은 GPL3.0 하에 배포됩니다."
-3003="sView 최신 버전은 공식 사이트 www.sview.ru에서 구할 수 있습니다.\n프로그램을 업데이트하세요."
-?3004="System Info"
-4000="닫기"
-?4001="Cancel"
-?4006="Save"
-?4007="Delete"
-?4008="Default"
-?4009="Defaults"
-?4010="Assign"
-?5000="[left]"
-?5001="[right]"
-?5002="File name"
-?5003="Dimensions"
-?5004="Load time"
-?5005="ms"
-?5006="Pixel ratio"
-?5007="Color model"
-?5008="(does not stored in metadata)"
-?5009="(does not match metadata)"
-?5011="(does not stored in metadata,\nbut detected from file name)"
-?5100="JPEG Comment"
-?5101="JPS Comment"
-?5200="Camera Maker"
-?5201="Camera Model"
-?5202="User Comment"
-?5203="Image timestamp"
-6000="전환 전체화면/윈도화면"
-?6001="Show/hide FPS meter"
-6002="입력 스테레오 형식: 자동감지"
-6003="입력 스테레오 형식: 모노"
-6004="입력 스테레오 형식: 상/하"
-6005="입력 스테레오 형식: 크로스-아이"
-?6006="Show file info"
-?6007="Playlist - Go to the first item"
-?6008="Playlist - Go to the last item"
-?6009="Playlist - Go to the previous item"
-?6010="Playlist - Go to the next item"
-?6011="Playlist - Start/stop slideshow"
-6012="다른 이름으로 저장 PNG"
-6013="다른 이름으로 저장 JPEG"
-?6014="Save file metadata"
-?6015="Delete the file from file system"
-?6016="Reset image adjustment"
-?6017="Reset image position"
-6018="좌/우 변경"
-?6019="Gamma correction - decrease"
-?6020="Gamma correction - increase"
-?6021="DX separation - decrease"
-?6022="DX separation - increase"
-?6023="DY separation - decrease"
-?6024="DY separation - increase"
-?6025="Angular separation - decrease"
-?6026="Angular separation - increase"
-?6027="Rotate 90 degrees counterclockwise"
-?6028="Rotate 90 degrees clockwise"
-?6029="Rotate counterclockwise"
-?6030="Rotate clockwise"
-?6031="Select next view mode"
-?6032="Panning - navigate to the left"
-?6033="Panning - navigate to the right"
-?6034="Panning - navigate to the top"
-?6035="Panning - navigate to the bottom"
-?6036="Scale - increment"
-?6037="Scale - decrement"
-?6038="Y Rotation - left"
-?6039="Y Rotation - right"
-?6040="X Rotation - up"
-?6041="X Rotation - down"
-?6042="Enable/disable panorama mode"
+1000=앞 이미지
+1001=다음 이미지
+1002=좌/우 변경
+1003=좌/우 복원
+1004=소스 포맷:
+1015=다른 이미지 열기
+1028=재생 목록 보이기/감추기
+1029=전환\n전체화면/윈도화면
+1100=미디어
+1101=이미지 열기...
+1102=다른 이름으로 저장...
+1103=입력 스테레오 형식
+?1104=Image info
+1109=나가기
+1110=한 파일에서 열기
+1111=좌+우 파일들에서 열기
+1130=자동감지
+1131=모노
+1132=크로스-아이
+1133=패럴렐 페어
+1134=상/하(R/L)
+1135=상/하(L/R)
+?1136=Interlaced
+?1137=Anaglyph Red/Cyan
+?1138=Anaglyph Green/Red+Blue
+?1139=Anaglyph Yellow/Blue
+?1142=2 Streams
+?1200=View
+1201=입체 출력
+1202=전체 화면
+1203=리셋
+1204=좌/우 변경
+1205=화면 비율
+?1206=Smooth Filter
+1207=이미지 보정
+?1208=Panorama
+?1210=Stereo
+?1211=Left View
+?1212=Right View
+1213=패럴렐 페어
+1214=크로스-아이
+?1250=Source
+1251=재시작시 유지
+?1252=Heal anamorphic 1080p/720p
+?1260=Nearest
+?1261=Linear
+1270=기본값으로 리셋
+1271=밝기
+?1272=Saturation
+1273=감마
+?1280=Off
+?1281=Sphere
+?1282=Cylinder
+?1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1400=장치 변경
+?1401=About Plugin...
+?1402=Show FPS
+?1403=VSync
+1500=도움말
+1501=이 프로그램에 대해...
+1502=업데이트 확인
+1503=라이선스 문서
+1504=언어 (Language)
+1506=사용자 팁
+?1508=About system
+?1509=Interface Scale
+?1510=Hotkeys
+?1511=Settings
+1520=지금
+1521=매일Each day
+1522=매주Each week
+1523=매년Each year
+1524=하지 않음Never
+1590=작게 Small
+1591=보통Normal
+1592=크게 Big
+1593=HiDPI 2X로
+2000=열어볼 이미지 파일 선택
+2001=왼쪽 이미지 선택
+2002=오른쪽 이미지 선택
+2003=Image Info
+2004=Information is unavailable
+2005=File deletion
+2006=Do you really want to completely remove this file?
+2007=File metadata saving
+2008=Do you really want to save metadata to the file?
+2009=Metadata can be saved only into JPEG files.
+2010=스냅샷 저장 위치 선택
+2011=저장할 수 없음!
+2012=스냅샷이 없음!
+?2013=Assign new Hot Key for action\n{0}
+?2014=Conflicts with: {0}
+3000=sView - 이미지 뷰어
+3001=version
+3002=이 이미지 뷰어로 JPEG, PNG, MPO 외 다양한 양식의 스테레오 이미지를 볼 수 있습니다.\n © {0} Kirill Gavrilov <{1}>\n 공식 사이트: {2}\n\n이 프로그램은 GPL3.0 하에 배포됩니다.
+3003=sView 최신 버전은 공식 사이트 www.sview.ru에서 구할 수 있습니다.\n프로그램을 업데이트하세요.
+?3004=System Info
+4000=닫기
+?4001=Cancel
+?4006=Save
+?4007=Delete
+?4008=Default
+?4009=Defaults
+?4010=Assign
+?5000=[left]
+?5001=[right]
+?5002=File name
+?5003=Dimensions
+?5004=Load time
+?5005=ms
+?5006=Pixel ratio
+?5007=Color model
+?5008=(does not stored in metadata)
+?5009=(does not match metadata)
+?5011=(does not stored in metadata,\nbut detected from file name)
+?5100=JPEG Comment
+?5101=JPS Comment
+?5200=Camera Maker
+?5201=Camera Model
+?5202=User Comment
+?5203=Image timestamp
+6000=전환 전체화면/윈도화면
+?6001=Show/hide FPS meter
+6002=입력 스테레오 형식: 자동감지
+6003=입력 스테레오 형식: 모노
+6004=입력 스테레오 형식: 상/하
+6005=입력 스테레오 형식: 크로스-아이
+?6006=Show file info
+?6007=Playlist - Go to the first item
+?6008=Playlist - Go to the last item
+?6009=Playlist - Go to the previous item
+?6010=Playlist - Go to the next item
+?6011=Playlist - Start/stop slideshow
+6012=다른 이름으로 저장 PNG
+6013=다른 이름으로 저장 JPEG
+?6014=Save file metadata
+?6015=Delete the file from file system
+?6016=Reset image adjustment
+?6017=Reset image position
+6018=좌/우 변경
+?6019=Gamma correction - decrease
+?6020=Gamma correction - increase
+?6021=DX separation - decrease
+?6022=DX separation - increase
+?6023=DY separation - decrease
+?6024=DY separation - increase
+?6025=Angular separation - decrease
+?6026=Angular separation - increase
+?6027=Rotate 90 degrees counterclockwise
+?6028=Rotate 90 degrees clockwise
+?6029=Rotate counterclockwise
+?6030=Rotate clockwise
+?6031=Select next view mode
+?6032=Panning - navigate to the left
+?6033=Panning - navigate to the right
+?6034=Panning - navigate to the top
+?6035=Panning - navigate to the bottom
+?6036=Scale - increment
+?6037=Scale - decrement
+?6038=Y Rotation - left
+?6039=Y Rotation - right
+?6040=X Rotation - up
+?6041=X Rotation - down
+?6042=Enable/disable panorama mode

sview-15_10.tar.gz/StImageViewer/lang/russian/StImageViewer.lng -> sview-15_11.tar.gz/StImageViewer/lang/russian/StImageViewer.lng Changed

@@ -1,169 +1,169 @@
 # Russian translation file for StImageViewer program
 # @author Kirill Gavrilov
 --------
-1000="Предыдущая картинка"
-1001="Следующая картинка"
-1002="Поменять ракурсы местами"
-1003="Отключить реверс ракурсов"
-1004="Исходный стереоформат:"
-1015="Открыть изображение"
-1028="Отобразить/Скрыть\nсписок файлов"
-1029="Оконный/Полноэкранный\nрежим просмотра"
-1100="Медиа"
-1101="Открыть изображение..."
-1102="Сохранить как..."
-1103="Исходный стереоформат"
-1104="Информация о файле"
-1109="Выход"
-1110="Из одного файла"
-1111="Левый+Правый файлы"
-1130="Исходный"
-1131="Моно"
-1132="Перекрёстная пара"
-1133="Параллельная пара"
-1134="Вертикальная пара (П/Л)"
-1135="Вертикальная пара (Л/П)"
-1136="Чересстрочный"
-1137="Анаглиф (Красно-Голубой)"
-1138="Анаглиф (Пурпурный)"
-1139="Анаглиф (Жёлтый)"
-1142="2 потока"
-1200="Вид"
-1201="Вывод стерео"
-1202="Полный экран"
-1203="Сбросить"
-1204="Реверс ракурсов"
-1205="Соотношение сторон"
-1206="Сглаживание текстур"
-1207="Цветокоррекция"
-1208="Панорама"
-1210="Стерео"
-1211="Левый ракурс"
-1212="Правый ракурс"
-1213="Параллельная пара"
-1214="Перекрёстная пара"
-1250="Исходное"
-1251="Запомнить"
-?1252="Heal anamorphic 1080p/720p"
-1260="Nearest"
-1261="Linear"
-1270="Сбросить настройки"
-1271="Яркость"
-1272="Насыщенность"
-1273="Гамма"
-1280="Плоскость"
-1281="Сфера"
-1282="Цилиндр"
-1283="Куб"
-1285="Отслеживать ориентацию"
-1286="Отслеживать ориентацию (poor)"
-1400="Выбрать устройство"
-1401="О модуле..."
-1402="Отображать FPS"
-1403="Верт. синхронизация"
-1500="Помощь"
-1501="О программе..."
-1502="Проверить обновления"
-1503="Открыть лицензию"
-1504="Language"
-1506="Подсказки"
-1508="О системе"
-1509="Масштаб. интерфейса"
-1510="Горячие клавиши"
-1511="Настройки"
-1520="Сейчас"
-1521="Каждый день"
-1522="Каждую неделю"
-1523="Каждый год"
-1524="Никогда"
-1590="Мелко"
-1591="Нормально"
-1592="Крупно"
-1593="Форсировать HiDPI 2X"
-2000="Выберите картинку"
-2001="Выберите файл с ЛЕВЫМ ракурсом"
-2002="Выберите файл с ПРАВЫМ ракурсом"
-2003="Информация о файле"
-2004="Информация не доступна"
-2005="Удаление файла"
-2006="Вы действительно хотите\nудалить файл минуя корзину?"
-2007="Сохранение метаданных"
-2008="Вы действительно хотите\nсохранить метаданные в файл?"
-2009="Сохранение метаданных доступно только для файлов JPEG."
-2010="Выберите путь для сохранения картинки"
-2011="Ничего не открыто!"
-2012="Изображение недоступно для сохранения!"
-2013="Назначить новую комбинацию для\n{0}"
-2014="Конфликтует с: {0}"
-3000="sView - программа для просмотра изображений"
-3001="версия"
-3002="Программа отображает стереоскопические изображения в форматах JPEG, PNG, MPO.\n © {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}\n\nПрограмма распространяется на условиях GPL3.0"
-3003="Доступно обновление программы.\nВы можете загрузить новую версию с официального сайта www.sview.ru."
-3004="Информация о системе"
-4000="Закрыть"
-4001="Отменить"
-4006="Сохранить"
-4007="Удалить"
-4008="По умолчанию"
-4009="Сбросить всё"
-4010="Установить"
-5000="[левый]"
-5001="[правый]"
-5002="Имя файла"
-5003="Разрешение"
-5004="Время загрузки"
-5005="мс"
-5006="Пропорции пикселя"
-5007="Color model"
-5008="(информация отсутствует в метаданных)"
-5009="(не соответствует метаданным)"
-5011="(информация отсутствует в метаданных,\nно была определена по имени файла)"
-5100="JPEG комментарий"
-5101="JPS комментарий"
-5200="Производитель камеры"
-5201="Модель камеры"
-5202="Комментарий"
-5203="Дата создания"
-6000="Активирование полноэкранного режима"
-6001="Отображение FPS"
-6002="Стереоформат - Автоопределение"
-6003="Стереоформат - Моно"
-6004="Стереоформат - Вертикальная пара"
-6005="Стереоформат - Перекрёстная пара"
-6006="Информация о файле"
-6007="Список файлов - Перейти к первому элементу"
-6008="Список файлов - Перейти к последнему элементу"
-6009="Список файлов - Перейти к предыдущему элементу"
-6010="Список файлов - Перейти к следующему элементу"
-6011="Список файлов - Запустить/остановить слайдшоу"
-6012="Сохранить в PNG формате"
-6013="Сохранить в JPEG формате"
-6014="Сохранить в файл метаданные со стереоформатом"
-6015="Удалить файл из файловой системы"
-6016="Сбросить настройки цвета"
-6017="Сбросить позицию картинки"
-6018="Реверс ракурсов"
-6019="Гамма коррекция - понизить коэффициент"
-6020="Гамма коррекция - повысить коэффициент"
-6021="DX разделение ракурсов - уменьшить"
-6022="DX разделение ракурсов - увеличить"
-6023="DY разделение ракурсов - уменьшить"
-6024="DY разделение ракурсов - увеличить"
-6025="Угловое разделение ракурсов - уменьшить"
-6026="Угловое разделение ракурсов - увеличить"
-6027="Поворот на 90 градусов против часовой стрелки"
-6028="Поворот на 90 градусов по часовой стрелке"
-6029="Поворот против часовой стрелки"
-6030="Поворот по часовой стрелке"
-6031="Выбрать следующий режим"
-6032="Паннинг - движение налево"
-6033="Паннинг - движение направо"
-6034="Паннинг - движение наверх"
-6035="Паннинг - движение вниз"
-6036="Масштабирование - увеличить"
-6037="Масштабирование - уменьшить"
-6038="Y наклон - налево"
-6039="Y наклон - направо"
-6040="X наклон - наверх"
-6041="X наклон - вниз"
-6042="Включить/выключить панорамный режим"
+1000=Предыдущая картинка
+1001=Следующая картинка
+1002=Поменять ракурсы местами
+1003=Отключить реверс ракурсов
+1004=Исходный стереоформат:
+1015=Открыть изображение
+1028=Отобразить/Скрыть\nсписок файлов
+1029=Оконный/Полноэкранный\nрежим просмотра
+1100=Медиа
+1101=Открыть изображение...
+1102=Сохранить как...
+1103=Исходный стереоформат
+1104=Информация о файле
+1109=Выход
+1110=Из одного файла
+1111=Левый+Правый файлы
+1130=Исходный
+1131=Моно
+1132=Перекрёстная пара
+1133=Параллельная пара
+1134=Вертикальная пара (П/Л)
+1135=Вертикальная пара (Л/П)
+1136=Чересстрочный
+1137=Анаглиф (Красно-Голубой)
+1138=Анаглиф (Пурпурный)
+1139=Анаглиф (Жёлтый)
+1142=2 потока
+1200=Вид
+1201=Вывод стерео
+1202=Полный экран
+1203=Сбросить
+1204=Реверс ракурсов
+1205=Соотношение сторон
+1206=Сглаживание текстур
+1207=Цветокоррекция
+1208=Панорама
+1210=Стерео
+1211=Левый ракурс
+1212=Правый ракурс
+1213=Параллельная пара
+1214=Перекрёстная пара
+1250=Исходное
+1251=Запомнить
+?1252=Heal anamorphic 1080p/720p
+1260=Nearest
+1261=Linear
+1270=Сбросить настройки
+1271=Яркость
+1272=Насыщенность
+1273=Гамма
+1280=Плоскость
+1281=Сфера
+1282=Цилиндр
+1283=Куб
+1285=Отслеживать ориентацию
+1286=Отслеживать ориентацию (poor)
+1400=Выбрать устройство
+1401=О модуле...
+1402=Отображать FPS
+1403=Верт. синхронизация
+1500=Помощь
+1501=О программе...
+1502=Проверить обновления
+1503=Открыть лицензию
+1504=Language
+1506=Подсказки
+1508=О системе
+1509=Масштаб. интерфейса
+1510=Горячие клавиши
+1511=Настройки
+1520=Сейчас
+1521=Каждый день
+1522=Каждую неделю
+1523=Каждый год
+1524=Никогда
+1590=Мелко
+1591=Нормально
+1592=Крупно
+1593=Форсировать HiDPI 2X
+2000=Выберите картинку
+2001=Выберите файл с ЛЕВЫМ ракурсом
+2002=Выберите файл с ПРАВЫМ ракурсом
+2003=Информация о файле
+2004=Информация не доступна
+2005=Удаление файла
+2006=Вы действительно хотите\nудалить файл минуя корзину?
+2007=Сохранение метаданных
+2008=Вы действительно хотите\nсохранить метаданные в файл?
+2009=Сохранение метаданных доступно только для файлов JPEG.
+2010=Выберите путь для сохранения картинки
+2011=Ничего не открыто!
+2012=Изображение недоступно для сохранения!
+2013=Назначить новую комбинацию для\n{0}
+2014=Конфликтует с: {0}
+3000=sView - программа для просмотра изображений
+3001=версия
+3002=Программа отображает стереоскопические изображения в форматах JPEG, PNG, MPO.\n © {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}\n\nПрограмма распространяется на условиях GPL3.0
+3003=Доступно обновление программы.\nВы можете загрузить новую версию с официального сайта www.sview.ru.
+3004=Информация о системе
+4000=Закрыть
+4001=Отменить
+4006=Сохранить
+4007=Удалить
+4008=По умолчанию
+4009=Сбросить всё
+4010=Установить
+5000=[левый]
+5001=[правый]
+5002=Имя файла
+5003=Разрешение
+5004=Время загрузки
+5005=мс
+5006=Пропорции пикселя
+5007=Color model
+5008=(информация отсутствует в метаданных)
+5009=(не соответствует метаданным)
+5011=(информация отсутствует в метаданных,\nно была определена по имени файла)
+5100=JPEG комментарий
+5101=JPS комментарий
+5200=Производитель камеры
+5201=Модель камеры
+5202=Комментарий
+5203=Дата создания
+6000=Активирование полноэкранного режима
+6001=Отображение FPS
+6002=Стереоформат - Автоопределение
+6003=Стереоформат - Моно
+6004=Стереоформат - Вертикальная пара
+6005=Стереоформат - Перекрёстная пара
+6006=Информация о файле
+6007=Список файлов - Перейти к первому элементу
+6008=Список файлов - Перейти к последнему элементу
+6009=Список файлов - Перейти к предыдущему элементу
+6010=Список файлов - Перейти к следующему элементу
+6011=Список файлов - Запустить/остановить слайдшоу
+6012=Сохранить в PNG формате
+6013=Сохранить в JPEG формате
+6014=Сохранить в файл метаданные со стереоформатом
+6015=Удалить файл из файловой системы
+6016=Сбросить настройки цвета
+6017=Сбросить позицию картинки
+6018=Реверс ракурсов
+6019=Гамма коррекция - понизить коэффициент
+6020=Гамма коррекция - повысить коэффициент
+6021=DX разделение ракурсов - уменьшить
+6022=DX разделение ракурсов - увеличить
+6023=DY разделение ракурсов - уменьшить
+6024=DY разделение ракурсов - увеличить
+6025=Угловое разделение ракурсов - уменьшить
+6026=Угловое разделение ракурсов - увеличить
+6027=Поворот на 90 градусов против часовой стрелки
+6028=Поворот на 90 градусов по часовой стрелке
+6029=Поворот против часовой стрелки
+6030=Поворот по часовой стрелке
+6031=Выбрать следующий режим
+6032=Паннинг - движение налево
+6033=Паннинг - движение направо
+6034=Паннинг - движение наверх
+6035=Паннинг - движение вниз
+6036=Масштабирование - увеличить
+6037=Масштабирование - уменьшить
+6038=Y наклон - налево
+6039=Y наклон - направо
+6040=X наклон - наверх
+6041=X наклон - вниз
+6042=Включить/выключить панорамный режим

sview-15_10.tar.gz/StMonitorsDump/StMonitorsDump.cbp -> sview-15_11.tar.gz/StMonitorsDump/StMonitorsDump.cbp Changed

@@ -6,32 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/StMonitorsDump" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../bin/$(TARGET_NAME)/" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-D_WIN32_WINNT=0x0500" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="gdi32" />
-					<Add library="user32" />
-					<Add library="kernel32" />
-					<Add library="Version" />
-					<Add library="nvapi" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StMonitorsDump" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
@@ -62,12 +36,12 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /manifest &quot;..\dpiAware.manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;1' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StMonitorsDump" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="1" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Compiler>
 					<Add option="/MDd" />
 					<Add option="/Od" />

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.cbp -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayer.cbp Changed

@@ -6,40 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStMoviePlayer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option parameters="--in=StMoviePlayer" />
-				<Option host_application="./sView" />
-				<Option run_host_application_in_terminal="0" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="OpenAL32" />
-					<Add library="gdi32" />
-					<Add library="Comdlg32" />
-					<Add library="shell32" />
-					<Add library="Wsock32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StMoviePlayer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
@@ -70,6 +36,7 @@
 					<Add library="Advapi32" />
 					<Add library="Comdlg32" />
 					<Add library="shell32" />
+					<Add library="Ole32" />
 					<Add library="Wsock32" />
 				</Linker>
 				<ExtraCommands>
@@ -77,12 +44,12 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StMoviePlayer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option parameters="--in=StMoviePlayer" />
 				<Option host_application="./sView" />
 				<Option run_host_application_in_terminal="0" />
@@ -111,6 +78,7 @@
 					<Add library="Advapi32" />
 					<Add library="Comdlg32" />
 					<Add library="shell32" />
+					<Add library="Ole32" />
 					<Add library="Wsock32" />
 					<Add library="Version" />
 				</Linker>
@@ -149,6 +117,7 @@
 					<Add library="Advapi32" />
 					<Add library="Comdlg32" />
 					<Add library="shell32" />
+					<Add library="Ole32" />
 					<Add library="Wsock32" />
 				</Linker>
 				<ExtraCommands>
@@ -310,9 +279,8 @@
 		<Unit filename="StMoviePlayer.h" />
 		<Unit filename="StMoviePlayer.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StMoviePlayerGUI.cpp" />
@@ -339,6 +307,7 @@
 		<Unit filename="StVideo/StSubtitlesASS.h" />
 		<Unit filename="StVideo/StVideo.cpp" />
 		<Unit filename="StVideo/StVideo.h" />
+		<Unit filename="StVideo/StVideoDxva2.cpp" />
 		<Unit filename="StVideo/StVideoQueue.cpp" />
 		<Unit filename="StVideo/StVideoQueue.h" />
 		<Unit filename="StVideo/StVideoTimer.cpp" />

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.cpp -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayer.cpp Changed

@@ -28,6 +28,7 @@
 #include <StSocket/StCheckUpdates.h>
 #include <StSettings/StSettings.h>
 #include <StStrings/StStringStream.h>
+#include <StCore/StSearchMonitors.h>
 
 #include <StGL/StGLContext.h>
 #include <StGLCore/StGLCore20.h>
@@ -98,6 +99,7 @@
 static const char ST_SETTING_WEBUI_ON[] = "webuiOn";
 static const char ST_SETTING_WEBUI_PORT[] = "webuiPort";
 static const char ST_SETTING_WEBUI_ERRORS[] = "webuiShowErrors";
+ static const char ST_SETTING_WEBUI_CMDPORT[] = "webuiCmdPort";
 
 static const char ST_ARGUMENT_FILE_LEFT[] = "left";
 static const char ST_ARGUMENT_FILE_RIGHT[] = "right";
@@ -105,6 +107,30 @@
 static const char ST_ARGUMENT_FILE_PAUSE[] = "pause";
 static const char ST_ARGUMENT_FILE_PAUSED[]= "paused";
 static const char ST_ARGUMENT_BENCHMARK[] = "benchmark";
+ static const char ST_ARGUMENT_SHOW_MENU[] = "toShowMenu";
+ static const char ST_ARGUMENT_SHOW_TOPBAR[]= "toShowTopbar";
+ static const char ST_ARGUMENT_MONITOR[] = "monitorId";
+ static const char ST_ARGUMENT_WINLEFT[] = "windowLeft";
+ static const char ST_ARGUMENT_WINTOP[] = "windowTop";
+ static const char ST_ARGUMENT_WINWIDTH[] = "windowWidth";
+ static const char ST_ARGUMENT_WINHEIGHT[] = "windowHeight";
+
+#ifdef _WIN32
+ inline void stFromLocaleOrUtf8(StString& theStrResult,
+ const char* theStrInput) {
+ int aWideSize = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, theStrInput, -1, NULL, 0);
+ if(aWideSize == 0) {
+ theStrResult.fromLocale(theStrInput);
+ return;
+ }
+
+ wchar_t* aWideBuffer = new wchar_t[aWideSize + 1];
+ MultiByteToWideChar(CP_UTF8, 0, theStrInput, -1, aWideBuffer, aWideSize);
+ aWideBuffer[aWideSize] = L'\0';
+ theStrResult.fromUnicode(aWideBuffer);
+ delete[] aWideBuffer;
+ }
+#endif
 
 }
 
@@ -115,40 +141,54 @@
 
 void StALDeviceParam::initList() {
 myValue = 0;
- myDevicesList.clear();
+ myDevicesLoc.clear();
+ myDevicesUtf.clear();
 StString aName;
 if(alcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT") != AL_TRUE) {
- // ansient OpenAL implementations supports only single device (like from apples)
+ // ancient OpenAL implementations (like from apples) support only single device
 const ALchar* aDefDevice = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
 #ifdef _WIN32
- aName.fromLocale(aDefDevice);
+ stFromLocaleOrUtf8(aName, aDefDevice);
 #else
 aName.fromUnicode(aDefDevice);
 #endif
- myDevicesList.add(aName);
+ myDevicesUtf.add(aName);
+ myDevicesLoc.push_back(std::string(aDefDevice));
 return;
 }
 
+ const StString THE_ALSOFT_SUFFIX(" on OpenAL Soft");
 const ALchar* aDevicesNames = alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
- while(aDevicesNames && *aDevicesNames) {
+ while(aDevicesNames != NULL
+ && *aDevicesNames != '\0') {
+ std::string aCName(aDevicesNames);
 #ifdef _WIN32
- aName.fromLocale(aDevicesNames);
+ stFromLocaleOrUtf8(aName, aDevicesNames);
 #else
 aName.fromUnicode(aDevicesNames);
 #endif
- myDevicesList.add(aName);
- aDevicesNames += strlen(aDevicesNames) + 1;
+ // cut-off redundant suffixes - the names are too long
+ if(aName.isEndsWithIgnoreCase(THE_ALSOFT_SUFFIX)) {
+ size_t anEnd = aName.getLength() - THE_ALSOFT_SUFFIX.getLength();
+ aName = aName.subString(0, anEnd);
+ }
+
+ myDevicesUtf.add(aName);
+ myDevicesLoc.push_back(aCName);
+ aDevicesNames += aCName.length() + 1;
 }
- if(myDevicesList.isEmpty()) {
- myDevicesList.add("None"); // append dummy device
+ if(myDevicesUtf.isEmpty()) {
+ // append dummy device
+ myDevicesUtf.add("None");
+ myDevicesLoc.push_back("");
 }
 }
 
 StALDeviceParam::~StALDeviceParam() {}
 
 int32_t StALDeviceParam::getValueFromName(const StString& theName) {
- for(size_t anId = 0; anId < myDevicesList.size(); ++anId) {
- if(myDevicesList[anId] == theName) {
+ for(size_t anId = 0; anId < myDevicesUtf.size(); ++anId) {
+ if(myDevicesUtf[anId] == theName) {
 return int32_t(anId);
 }
 }
@@ -160,12 +200,22 @@
 return myValue >= 0;
 }
 
-StString StALDeviceParam::getTitle() const {
- if(myDevicesList.isEmpty()) {
+StString StALDeviceParam::getUtfTitle() const {
+ if(myDevicesUtf.isEmpty()) {
 return StString();
 }
+
 int32_t anActive = getValue();
- return myDevicesList[(anActive >= 0 && size_t(anActive) < myDevicesList.size()) ? size_t(anActive) : 0];
+ return myDevicesUtf[(anActive >= 0 && size_t(anActive) < myDevicesUtf.size()) ? size_t(anActive) : 0];
+}
+
+std::string StALDeviceParam::getCTitle() const {
+ if(myDevicesUtf.isEmpty()) {
+ return std::string();
+ }
+
+ int32_t anActive = getValue();
+ return myDevicesLoc[(anActive >= 0 && size_t(anActive) < myDevicesUtf.size()) ? size_t(anActive) : 0];
 }
 
 /**
@@ -485,6 +535,8 @@
 params.ToShowPlayList->signals.onChanged = stSlot(this, &StMoviePlayer::doShowPlayList);
 params.ToTrackHead = new StBoolParamNamed(true, tr(MENU_VIEW_TRACK_HEAD));
 params.ToShowFps = new StBoolParamNamed(false, tr(MENU_FPS_METER));
+ params.ToShowMenu = new StBoolParamNamed(true, "Show main menu");
+ params.ToShowTopbar= new StBoolParamNamed(true, "Show top toolbar");
 params.IsMobileUI = new StBoolParamNamed(StWindow::isMobile(), "Mobile UI");
 params.IsMobileUI->signals.onChanged = stSlot(this, &StMoviePlayer::doScaleHiDPI);
 params.IsVSyncOn = new StBoolParam(true);
@@ -496,6 +548,7 @@
 params.StartWebUI->changeValues().add(tr(MENU_MEDIA_WEBUI_ONCE));
 params.StartWebUI->changeValues().add(tr(MENU_MEDIA_WEBUI_ON));
 params.ToPrintWebErrors = new StBoolParam(true);
+ params.IsLocalWebUI = new StBoolParam(false);
 params.WebUIPort = new StInt32Param(8080);
 params.audioStream = new StInt32Param(-1);
 params.audioStream->signals.onChanged = stSlot(this, &StMoviePlayer::doSwitchAudioStream);
@@ -735,7 +788,7 @@
 mySettings->saveParam (ST_SETTING_SUBTITLES_PARSER, params.SubtitlesParser);
 mySettings->saveParam (ST_SETTING_SEARCH_SUBS, params.ToSearchSubs);
 mySettings->saveInt32 (ST_SETTING_FPSTARGET, params.TargetFps);
- mySettings->saveString(ST_SETTING_OPENAL_DEVICE, params.alDevice->getTitle());
+ mySettings->saveString(ST_SETTING_OPENAL_DEVICE, params.alDevice->getUtfTitle());
 mySettings->saveInt32 (ST_SETTING_UPDATES_LAST_CHECK, myLastUpdateDay);
 mySettings->saveParam (ST_SETTING_UPDATES_INTERVAL, params.checkUpdatesDays);
 mySettings->saveParam (ST_SETTING_SRCFORMAT, params.srcFormat);
@@ -752,7 +805,9 @@
 mySettings->saveParam (ST_SETTING_GPU_DECODING, params.UseGpu);
 
 mySettings->saveParam (ST_SETTING_WEBUI_ON, params.StartWebUI);
- mySettings->saveParam (ST_SETTING_WEBUI_PORT, params.WebUIPort);
+ if(!params.IsLocalWebUI->getValue()) {
+ mySettings->saveParam (ST_SETTING_WEBUI_PORT, params.WebUIPort);
+ }
 mySettings->saveParam (ST_SETTING_WEBUI_ERRORS, params.ToPrintWebErrors);
 mySettings->saveParam (ST_SETTING_SAVE_IMG_TYPE, params.SnapshotImgType);
 mySettings->saveParam (ST_SETTING_EXPERIMENTAL, params.ToShowExtra);
@@ -896,7 +951,14 @@
 stMemZero(&aCallbacks, sizeof(aCallbacks));
 aCallbacks.begin_request = StMoviePlayer::beginRequestHandler;
 const StString aPort = params.WebUIPort->getValue();
- const char* anOptions[] = { "listening_ports", aPort.toCString(), NULL };
+
+ StString aControlList = "+0.0.0.0/0";
+ if(params.IsLocalWebUI->getValue()) {
+ aControlList = "-0.0.0.0/0,+127.0.0.0/16";
+ }
+ const char* anOptions[] = { "listening_ports", aPort.toCString(),
+ "access_control_list", aControlList.toCString(),
+ NULL };
 myWebCtx = mg_start(&aCallbacks, this, anOptions);
 if(myWebCtx == NULL
 && params.ToPrintWebErrors->getValue()) {
@@ -940,6 +1002,17 @@
 
 // load hot-keys
 if(!isReset) {
+ #ifdef ST_HAVE_MONGOOSE
+ // handle this argument in advance
+ if(!myOpenFileInfo.isNull()) {
+ StArgument anArgWebuiCmd = myOpenFileInfo->getArgumentsMap()[ST_SETTING_WEBUI_CMDPORT];
+ if(anArgWebuiCmd.isValid()) {
+ params.IsLocalWebUI->setValue(true);
+ params.WebUIPort->setValue(::atol(anArgWebuiCmd.getValue().toCString()));
+ }
+ }
+ #endif
+
 for(std::map< int, StHandle<StAction> >::iterator anIter = myActions.begin();
 anIter != myActions.end(); ++anIter) {
 mySettings->loadHotKey(anIter->second);
@@ -962,7 +1035,7 @@
 
 // create the video playback thread
 if(!isReset) {
- myVideo = new StVideo(params.alDevice->getTitle(), myLangMap, myPlayList, aTextureQueue, aSubQueue);
+ myVideo = new StVideo(params.alDevice->getCTitle(), myLangMap, myPlayList, aTextureQueue, aSubQueue);
 myVideo->signals.onError = stSlot(myMsgQueue.access(), &StMsgQueue::doPushError);
 myVideo->signals.onLoaded = stSlot(this, &StMoviePlayer::doLoaded);
 myVideo->params.UseGpu = params.UseGpu;
@@ -1005,16 +1078,57 @@
 }
 
 void StMoviePlayer::parseArguments(const StArgumentsMap& theArguments) {
- StArgument anArgFullscr = theArguments[ST_SETTING_FULLSCREEN];
 StArgument anArgViewMode = theArguments[ST_SETTING_VIEWMODE];
 StArgument anArgSrcFormat = theArguments[ST_SETTING_SRCFORMAT];
 StArgument anArgShuffle = theArguments[ST_SETTING_SHUFFLE];
 StArgument anArgLoopSingle = theArguments[ST_SETTING_LOOP_SINGLE];
 StArgument anArgBenchmark = theArguments[ST_ARGUMENT_BENCHMARK];
-
- if(anArgFullscr.isValid()) {
- params.isFullscreen->setValue(!anArgFullscr.isValueOff());
+ StArgument anArgShowMenu = theArguments[ST_ARGUMENT_SHOW_MENU];
+ StArgument anArgShowTopbar = theArguments[ST_ARGUMENT_SHOW_TOPBAR];
+
+ StArgument anArgFullscreen = theArguments[ST_SETTING_FULLSCREEN];
+ StArgument anArgMonitor = theArguments[ST_ARGUMENT_MONITOR];
+ StArgument anArgWinLeft = theArguments[ST_ARGUMENT_WINLEFT];
+ StArgument anArgWinTop = theArguments[ST_ARGUMENT_WINTOP];
+ StArgument anArgWinWidth = theArguments[ST_ARGUMENT_WINWIDTH];
+ StArgument anArgWinHeight = theArguments[ST_ARGUMENT_WINHEIGHT];
+ StRect<int32_t> aRect = myWindow->getWindowedPlacement();
+ bool toSetRect = false;
+ if(anArgMonitor.isValid()) {
+ const size_t aMonId = (size_t )::atol(anArgMonitor.getValue().toCString());
+ const StMonitor& aMonOld = myWindow->getMonitors()[aRect.center()];
+ const StMonitor& aMonNew = myWindow->getMonitors()[aMonId];
+ if(aMonOld.getId() != aMonNew.getId()) {
+ const int aLeft = aRect.left() - aMonOld.getVRect().left();
+ const int aTop = aRect.top() - aMonOld.getVRect().top();
+ aRect.moveLeftTo(aMonNew.getVRect().left() + aLeft);
+ aRect.moveTopTo (aMonNew.getVRect().top() + aTop);
+ toSetRect = true;
+ }
+ }
+ if(anArgWinLeft.isValid()) {
+ aRect.moveLeftTo(::atol(anArgWinLeft.getValue().toCString()));
+ toSetRect = true;
+ }
+ if(anArgWinTop.isValid()) {
+ aRect.moveTopTo(::atol(anArgWinTop.getValue().toCString()));
+ toSetRect = true;
+ }
+ if(anArgWinWidth.isValid()) {
+ aRect.right() = aRect.left() + ::atol(anArgWinWidth.getValue().toCString());
+ toSetRect = true;
+ }
+ if(anArgWinHeight.isValid()) {
+ aRect.bottom() = aRect.top() + ::atol(anArgWinHeight.getValue().toCString());
+ toSetRect = true;
+ }
+ if(toSetRect) {
+ myWindow->setPlacement(aRect, true);
+ }
+ if(anArgFullscreen.isValid()) {
+ params.isFullscreen->setValue(!anArgFullscreen.isValueOff());
 }
+
 if(anArgViewMode.isValid()) {
 myPlayList->changeDefParams().ViewingMode = StStereoParams::GET_VIEW_MODE_FROM_STRING(anArgViewMode.getValue());
 }
@@ -1031,6 +1145,12 @@
 myIsBenchmark = !anArgBenchmark.isValueOff();
 myVideo->setBenchmark(myIsBenchmark);
 }
+ if(anArgShowMenu.isValid()) {
+ params.ToShowMenu->setValue(!anArgShowMenu.isValueOff());
+ }
+ if(anArgShowTopbar.isValid()) {
+ params.ToShowTopbar->setValue(!anArgShowTopbar.isValueOff());
+ }
 }
 
 bool StMoviePlayer::open() {
@@ -1312,19 +1432,91 @@
 }
 
 void StMoviePlayer::doFileDrop(const StDNDropEvent& theEvent) {
- const StString aFilePath = theEvent.File;
- if(myPlayList->checkExtension(aFilePath)) {
- const size_t aRecent = myPlayList->findRecent(aFilePath);
- if(aRecent != size_t(-1)) {
- doOpenRecent(aRecent);
+ if(theEvent.NbFiles == 0) {
+ return;
+ }
+
+ const StString aFile1 = theEvent.Files[0];
+ const StString aFile2 = theEvent.NbFiles > 1 ? theEvent.Files[1] : "";
+ const StString anExt1 = StFileNode::getExtension(aFile1);
+ if(theEvent.NbFiles == 1
+ || StFolder::isFolder(aFile1)) {
+ // attach subtitle to currently opened item
+ for(size_t anExtId = 0; anExtId < myVideo->getMimeListSubtitles().size(); ++anExtId) {
+ if(!anExt1.isEqualsIgnoreCase(myVideo->getMimeListSubtitles()[anExtId].getExtension())) {
+ continue;
+ }
+
+ StHandle<StFileNode> aCurrFile = myPlayList->getCurrentFile();
+ if(aCurrFile.isNull()) {
+ ST_ERROR_LOG("Can not attach subtitles");
+ return;
+ }
+
+ myPlayList->addToNode(aCurrFile, aFile1);
+ myAudioOnLoad = myVideo->params.activeAudio->getValue();
+ mySubsOnLoad = myVideo->params.activeSubtitles->getListSize();
+ mySeekOnLoad = myVideo->getPts();
+ doUpdateStateLoading();
+ myVideo->pushPlayEvent(ST_PLAYEVENT_RESUME);
+ myVideo->doLoadNext();
 return;
 }
 
- myPlayList->open(aFilePath);
- doUpdateStateLoading();
- myVideo->pushPlayEvent(ST_PLAYEVENT_RESUME);
- myVideo->doLoadNext();
+ // just open the path
+ if(myPlayList->checkExtension(aFile1)) {
+ const size_t aRecent = myPlayList->findRecent(aFile1);
+ if(aRecent != size_t(-1)) {
+ doOpenRecent(aRecent);
+ return;
+ }
+
+ myPlayList->open(aFile1);
+ doUpdateStateLoading();
+ myVideo->pushPlayEvent(ST_PLAYEVENT_RESUME);
+ myVideo->doLoadNext();
+ }
+ return;
+ } else if(theEvent.NbFiles == 2
+ && !StFolder::isFolder(aFile2)
+ && myPlayList->checkExtension(aFile2)) {
+ // handle stereopair
+ StString anExt2 = StFileNode::getExtension(aFile2);
+ int aNbVideos = 0;
+ for(size_t anExtId = 0; anExtId < myVideo->getMimeListVideo().size(); ++anExtId) {
+ if(!anExt1.isEqualsIgnoreCase(myVideo->getMimeListVideo()[anExtId].getExtension())) {
+ ++aNbVideos;
+ break;
+ }
+ }
+ for(size_t anExtId = 0; anExtId < myVideo->getMimeListVideo().size(); ++anExtId) {
+ if(!anExt2.isEqualsIgnoreCase(myVideo->getMimeListVideo()[anExtId].getExtension())) {
+ ++aNbVideos;
+ break;
+ }
+ }
+
+ if(aNbVideos == 2) {
+ myVideo->getPlayList().clear();
+ myVideo->getPlayList().addOneFile(aFile1, aFile2);
+ doUpdateStateLoading();
+ myVideo->pushPlayEvent(ST_PLAYEVENT_RESUME);
+ myVideo->doLoadNext();
+ return;
+ }
+ }
+
+ myVideo->getPlayList().clear();
+ for(uint32_t aFileIter = 0; aFileIter < theEvent.NbFiles; ++aFileIter) {
+ StString aPath(theEvent.Files[aFileIter]);
+ if(!StFolder::isFolder(aPath)
+ && myPlayList->checkExtension(aPath)) {
+ myVideo->getPlayList().addOneFile(aPath, StMIME());
+ }
 }
+ doUpdateStateLoading();
+ myVideo->pushPlayEvent(ST_PLAYEVENT_RESUME);
+ myVideo->doLoadNext();
 }
 
 void StMoviePlayer::doNavigate(const StNavigEvent& theEvent) {
@@ -1341,15 +1533,15 @@
 }
 
 if(myVideo->isDisconnected() || myToUpdateALList) {
- const StString aPrevDev = params.alDevice->getTitle();
+ const StString aPrevDev = params.alDevice->getUtfTitle();
 params.alDevice->initList();
 myGUI->updateOpenALDeviceMenu();
 // switch audio device
 if(!params.alDevice->init(aPrevDev)) {
 // select first existing device if any
- params.alDevice->init(params.alDevice->getTitle());
+ params.alDevice->init(params.alDevice->getUtfTitle());
 }
- myVideo->switchAudioDevice(params.alDevice->getTitle());
+ myVideo->switchAudioDevice(params.alDevice->getCTitle());
 myToUpdateALList = false;
 }
 if(myPlayList->isRecentChanged()) {
@@ -1395,7 +1587,6 @@
 }
 
 // re-create GUI when necessary
- const bool hasVideoStream = myVideo->hasVideoStream();
 if(params.ScaleHiDPI->setValue(myWindow->getScaleFactor())
 || myToRecreateMenu) {
 StHandle<StGLTextureQueue> aTextureQueue;
@@ -1404,31 +1595,10 @@
 myToRecreateMenu = false;
 }
 
- const bool isMouseMove = myWindow->isMouseMoved();
 if(myEventLoaded.checkReset()) {
 doUpdateStateLoaded();
 }
 
- if(myIsBenchmark
- || !params.ToLimitFps->getValue()) {
- // do not limit FPS
- myWindow->setTargetFps(-1.0);
- } else if(params.TargetFps >= 1
- && params.TargetFps <= 3) {
- // set rendering FPS to 2x averageFPS
- double aTargetFps = myVideo->getAverFps();
- if(aTargetFps < 17.0
- || aTargetFps > 120.0) {
- aTargetFps = 0.0;
- } else if(aTargetFps < 40.0) {
- aTargetFps *= double(params.TargetFps);
- }
- myWindow->setTargetFps(aTargetFps);
- } else {
- // set rendering FPS to set value in settings
- myWindow->setTargetFps(double(params.TargetFps));
- }
-
 if(myToCheckUpdates && !myUpdates.isNull() && myUpdates->isInitialized()) {
 if(myUpdates->isNeedUpdate()) {
 myGUI->showUpdatesNotify();
@@ -1453,7 +1623,7 @@
 if(myGUI->mySeekBar != NULL) {
 myGUI->mySeekBar->setProgress(GLfloat(aPosition));
 }
- myGUI->stglUpdate(myWindow->getMousePos(), isMouseMove || !hasVideoStream);
+ myGUI->stglUpdate(myWindow->getMousePos());
 
 // prevent display going to sleep
 bool toBlockSleepDisplay = false;
@@ -1479,7 +1649,7 @@
 break;
 }
 case BLOCK_SLEEP_FULLSCREEN: {
- toBlockSleepDisplay = myWindow->isFullScreen();;
+ toBlockSleepDisplay = myWindow->isFullScreen();
 toBlockSleepSystem = toBlockSleepDisplay;
 break;
 }
@@ -1500,6 +1670,33 @@
 myWindow->setStereoOutput(!aParams->isMono()
 && (myGUI->myImage->params.displayMode->getValue() == StGLImageRegion::MODE_STEREO));
 }
+
+ if(myIsBenchmark
+ || !params.ToLimitFps->getValue()) {
+ // do not limit FPS
+ myWindow->setTargetFps(-1.0);
+ } else if(params.TargetFps >= 1
+ && params.TargetFps <= 3) {
+ // set rendering FPS to 2x averageFPS
+ double aTargetFps = myVideo->getAverFps();
+ if(aTargetFps < 17.0
+ || aTargetFps > 120.0) {
+ aTargetFps = 0.0;
+ } else if(aTargetFps < 40.0) {
+ aTargetFps *= double(params.TargetFps);
+ }
+
+ if(myWindow->toTrackOrientation()) {
+ // do not limit FPS within head-tracking mode
+ aTargetFps = 0.0;
+ }
+
+ myWindow->setTargetFps(aTargetFps);
+ } else {
+ // set rendering FPS to set value in settings
+ myWindow->setTargetFps(double(params.TargetFps));
+ }
+
 }
 
 void StMoviePlayer::doUpdateOpenALDeviceList(const size_t ) {
@@ -1582,7 +1779,7 @@
 
 void StMoviePlayer::doSwitchAudioDevice(const int32_t /*theDevId*/) {
 if(!myVideo.isNull()) {
- myVideo->switchAudioDevice(params.alDevice->getTitle());
+ myVideo->switchAudioDevice(params.alDevice->getCTitle());
 }
 }
 
@@ -1946,6 +2143,18 @@
 }
 }
 }
+ } else if(anURI.isEquals(stCString("/action"))) {
+ if(!params.IsLocalWebUI->getValue()) {
+ aContent = "Error: command interace is disabled!";
+ } else {
+ const int anActionId = getActionIdFromName(aQuery);
+ if(anActionId != -1) {
+ invokeAction(anActionId);
+ aContent = "Action has been invoked";
+ } else {
+ aContent = "Error: unknown action";
+ }
+ }
 } else {
 aContent = StString("query_string: '") + aQuery + "'\n"
 + StString("uri: '") + anURI + "'";

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.h -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayer.h Changed

@@ -29,6 +29,8 @@
 
 #include <StGLWidgets/StGLImageRegion.h>
 
+#include <vector>
+
 // forward declarations
 class StCheckUpdates;
 class StFileNode;
@@ -56,9 +58,9 @@
 ST_LOCAL StALDeviceParam();
 
 /**
- * Desctructor.
+ * Destructor.
 */
- ST_LOCAL ~StALDeviceParam();
+ ST_LOCAL virtual ~StALDeviceParam();
 
 ST_LOCAL void initList();
 
@@ -69,18 +71,24 @@
 /**
 * Returns title for active AL device.
 */
- ST_LOCAL StString getTitle() const;
+ ST_LOCAL StString getUtfTitle() const;
+
+ /**
+ * Returns title for active AL device.
+ */
+ ST_LOCAL std::string getCTitle() const;
 
 /**
 * Return list of available translations.
 */
 ST_LOCAL const StArrayList<StString>& getList() const {
- return myDevicesList;
+ return myDevicesUtf;
 }
 
 private:
 
- StArrayList<StString> myDevicesList;
+ std::vector<std::string> myDevicesLoc;
+ StArrayList<StString> myDevicesUtf;
 
 };
 
@@ -217,11 +225,14 @@
 StHandle<StBoolParam> ToTrackHead; //!< enable/disable head-tracking
 StHandle<StBoolParam> ToShowPlayList; //!< display playlist
 StHandle<StBoolParam> ToShowFps; //!< display FPS meter
+ StHandle<StBoolParam> ToShowMenu; //!< show main menu
+ StHandle<StBoolParam> ToShowTopbar; //!< show topbar
 StHandle<StBoolParam> IsMobileUI; //!< display mobile interface
 StHandle<StBoolParam> ToLimitFps; //!< limit CPU usage or not
 StHandle<StBoolParam> IsVSyncOn; //!< flag to use VSync
 StHandle<StEnumParam> StartWebUI; //!< to start Web UI or not
 StHandle<StBoolParam> ToPrintWebErrors; //!< print Web UI starting errors
+ StHandle<StBoolParam> IsLocalWebUI; //!< restrict remote access to 127.0.0.0
 StHandle<StInt32Param> WebUIPort; //!< port to start Web UI
 StHandle<StInt32Param> audioStream; //!< active Audio stream
 StHandle<StInt32Param> subtitlesStream; //!< active Subtitles stream

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.vcxproj -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayer.vcxproj Changed

@@ -96,7 +96,7 @@
 <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;Ole32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_x86;..\lib\WIN_vc_x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <SubSystem>Windows</SubSystem>
@@ -130,7 +130,7 @@
 <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;_DEBUG;ST_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;Ole32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_x86_DEBUG;..\lib\WIN_vc_x86_DEBUG;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -164,7 +164,7 @@
 <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;Ole32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_AMD64;..\lib\WIN_vc_AMD64;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <SubSystem>Windows</SubSystem>
@@ -198,7 +198,7 @@
 <PreprocessorDefinitions>ST_HAVE_STCONFIG;_CRT_SECURE_NO_WARNINGS;_DEBUG;ST_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ResourceCompile>
 <Link>
- <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;OpenAL32.lib;user32.lib;gdi32.lib;Advapi32.lib;Comdlg32.lib;Shell32.lib;Ole32.lib;avutil.lib;avformat.lib;avcodec.lib;swscale.lib;freetype.lib;libwebp.lib;StGLWidgets.lib;StShared.lib;StCore.lib;StOutAnaglyph.lib;StOutDual.lib;StOutIZ3D.lib;StOutInterlace.lib;StOutPageFlip.lib;StOutDistorted.lib;%(AdditionalDependencies)</AdditionalDependencies>
 <SuppressStartupBanner>true</SuppressStartupBanner>
 <AdditionalLibraryDirectories>..\3rdparty\lib\WIN_vc_AMD64_DEBUG;..\lib\WIN_vc_AMD64_DEBUG;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -214,6 +214,7 @@
 <ClCompile Include="StVideo\StSubtitleQueue.cpp" />
 <ClCompile Include="StVideo\StSubtitlesASS.cpp" />
 <ClCompile Include="StVideo\StVideo.cpp" />
+ <ClCompile Include="StVideo\StVideoDxva2.cpp" />
 <ClCompile Include="StVideo\StVideoQueue.cpp" />
 <ClCompile Include="StVideo\StVideoTimer.cpp" />
 <ClCompile Include="stMongoose.c" />

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayer.vcxproj.filters -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayer.vcxproj.filters Changed

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayerGUI.cpp -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayerGUI.cpp Changed

@@ -70,9 +70,9 @@
 static const int DISPL_X_REGION_UPPER = 32;
 static const int DISPL_X_REGION_BOTTOM = 52;
 
- static const StGLVec3 aBlack(0.0f, 0.0f, 0.0f);
- static const StGLVec3 aGreen(0.4f, 0.8f, 0.4f);
- static const StGLVec3 aRed (1.0f, 0.0f, 0.0f);
+ static const StGLVec3 aBlack (0.0f, 0.0f, 0.0f);
+ static const StGLVec3 aGreen (0.0f, 0.6f, 0.4f);
+ static const StGLVec3 aRed (1.0f, 0.0f, 0.0f);
 
 }
 
@@ -150,10 +150,10 @@
 myBtnInfo->changeMargins() = aButtonMargins;
 
 StGLTextureButton* aSrcBtn = new StGLTextureButton(myPanelUpper, aLeft + (aBtnIter++) * anIconStep, aTop,
- StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), StFormat_NB);
+ StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), StFormat_NB + 1);
 aSrcBtn->changeMargins() = aButtonMargins;
 aSrcBtn->signals.onBtnClick += stSlot(this, &StMoviePlayerGUI::doDisplayStereoFormatCombo);
- const StString aSrcTextures[StFormat_NB] = {
+ const StString aSrcTextures[StFormat_NB + 1] = {
 iconTexture(stCString("menuMono"), anIconSize),
 iconTexture(stCString("menuSbsLR"), anIconSize),
 iconTexture(stCString("menuSbsRL"), anIconSize),
@@ -166,9 +166,10 @@
 iconTexture(stCString("menuRedCyanLR"), anIconSize),
 iconTexture(stCString("menuGreenMagentaLR"), anIconSize),
 iconTexture(stCString("menuYellowBlueLR"), anIconSize),
- iconTexture(stCString("menuTiledLR"), anIconSize)
+ iconTexture(stCString("menuTiledLR"), anIconSize),
+ iconTexture(stCString("menuAuto"), anIconSize)
 };
- aSrcBtn->setTexturePath(aSrcTextures, StFormat_NB);
+ aSrcBtn->setTexturePath(aSrcTextures, StFormat_NB + 1);
 aSrcBtn->setDrawShadow(true);
 myBtnSrcFrmt = aSrcBtn;
 
@@ -374,7 +375,11 @@
 #endif
 
 #ifdef ST_HAVE_MONGOOSE
- aMenuMedia->addItem(tr(MENU_MEDIA_WEBUI) + ":" + myPlugin->params.WebUIPort->getValue(), aMenuWebUI);
+ StString aWebUiItem = tr(MENU_MEDIA_WEBUI) + ":" + myPlugin->params.WebUIPort->getValue();
+ if(myPlugin->params.IsLocalWebUI->getValue()) {
+ aWebUiItem += " [CMD]";
+ }
+ aMenuMedia->addItem(aWebUiItem, aMenuWebUI);
 #endif
 aMenuMedia->addItem(tr(MENU_MEDIA_QUIT), myPlugin->getAction(StMoviePlayer::Action_Quit));
 return aMenuMedia;
@@ -515,6 +520,10 @@
 StGLMenu* StMoviePlayerGUI::createWebUIMenu() {
 StGLMenu* aMenu = new StGLMenu(this, 0, 0, StGLMenu::MENU_VERTICAL);
 for(size_t anIter = 0; anIter < myPlugin->params.StartWebUI->getValues().size(); ++anIter) {
+ if(myPlugin->params.IsLocalWebUI->getValue()
+ && anIter == StMoviePlayer::WEBUI_AUTO) {
+ continue;
+ }
 aMenu->addItem(myPlugin->params.StartWebUI->getValues()[anIter], myPlugin->params.StartWebUI, (int32_t )anIter);
 }
 aMenu->addItem(tr(MENU_MEDIA_WEBUI_SHOW_ERRORS), myPlugin->params.ToPrintWebErrors);
@@ -1187,10 +1196,10 @@
 myBtnOpen->changeMargins() = aButtonMargins;
 
 StGLTextureButton* aSrcBtn = new StGLTextureButton(myPanelUpper, (aBtnIter++) * myIconStep, 0,
- StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), StFormat_NB);
+ StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT), StFormat_NB + 1);
 aSrcBtn->changeMargins() = aButtonMargins;
 aSrcBtn->signals.onBtnClick += stSlot(this, &StMoviePlayerGUI::doDisplayStereoFormatCombo);
- const StString aSrcTextures[StFormat_NB] = {
+ const StString aSrcTextures[StFormat_NB + 1] = {
 iconTexture(stCString("menuMono"), anIconSize),
 iconTexture(stCString("menuSbsLR"), anIconSize),
 iconTexture(stCString("menuSbsRL"), anIconSize),
@@ -1203,9 +1212,10 @@
 iconTexture(stCString("menuRedCyanLR"), anIconSize),
 iconTexture(stCString("menuGreenMagentaLR"), anIconSize),
 iconTexture(stCString("menuYellowBlueLR"), anIconSize),
- iconTexture(stCString("menuTiledLR"), anIconSize)
+ iconTexture(stCString("menuTiledLR"), anIconSize),
+ iconTexture(stCString("menuAuto"), anIconSize)
 };
- aSrcBtn->setTexturePath(aSrcTextures, StFormat_NB);
+ aSrcBtn->setTexturePath(aSrcTextures, StFormat_NB + 1);
 aSrcBtn->setDrawShadow(true);
 myBtnSrcFrmt = aSrcBtn;
 
@@ -1304,6 +1314,12 @@
 
 StGLOpenFile* aDialog = new StGLOpenFile(this, tr(DIALOG_OPEN_FILE), tr(BUTTON_CLOSE));
 aDialog->setMimeList(myPlugin->myVideo->getMimeListVideo());
+#if defined(_WIN32)
+ //
+#else
+ aDialog->addHotItem("/", "Root");
+#endif
+ aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_SdCard));
 aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Downloads));
 aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Videos));
 aDialog->addHotItem(getResourceManager()->getFolder(StResourceManager::FolderId_Music));
@@ -1368,6 +1384,7 @@
 anItem->setIcon(stCMenuIcon("actionSettings"));
 anItem->signals.onItemClick += stSlot(this, &StMoviePlayerGUI::doMobileSettings);
 aMenu->stglInit();
+ setFocus(aMenu);
 }
 
 StMoviePlayerGUI::StMoviePlayerGUI(StMoviePlayer* thePlugin,
@@ -1467,8 +1484,7 @@
 //
 }
 
-void StMoviePlayerGUI::stglUpdate(const StPointD_t& thePointZo,
- bool theIsMouseMoved) {
+void StMoviePlayerGUI::stglUpdate(const StPointD_t& thePointZo) {
 if(mySeekBar != NULL
 && myPanelBottom != NULL
 && myTimeBox->wasResized()) {
@@ -1482,7 +1498,7 @@
 myBtnSubs->getTrackedValue()->setValue(myPlugin->params.subtitlesStream->getValue() != -1);
 }
 
- setVisibility(thePointZo, theIsMouseMoved);
+ setVisibility(thePointZo);
 StGLRootWidget::stglUpdate(thePointZo);
 if(myVolumeBar != NULL) {
 char aBuff[128];
@@ -1635,21 +1651,28 @@
 
 }
 
-void StMoviePlayerGUI::setVisibility(const StPointD_t& theCursor,
- bool theIsMouseMoved) {
+void StMoviePlayerGUI::setVisibility(const StPointD_t& theCursor) {
 const bool toShowPlayList = myPlugin->params.ToShowPlayList->getValue();
+ const bool hasMainMenu = myPlugin->params.ToShowMenu->getValue()
+ && myMenuRoot != NULL;
+ const bool hasUpperPanel = myPlugin->params.ToShowTopbar->getValue()
+ && myPanelUpper != NULL;
+
 const int aRootSizeY = getRectPx().height();
 const bool hasVideo = myPlugin->myVideo->hasVideoStream();
+ const bool isMouseActive = myWindow->isMouseMoved();
+ const double aStillTime = myVisibilityTimer.getElapsedTime();
 StHandle<StStereoParams> aParams = myImage->getSource();
- myIsVisibleGUI = theIsMouseMoved
+ myIsVisibleGUI = !hasVideo
+ || isMouseActive
 || aParams.isNull()
- || myVisibilityTimer.getElapsedTime() < 2.0
- || (myPanelUpper != NULL && myPanelUpper ->isPointIn(theCursor))
+ || aStillTime < 2.0
+ || (hasUpperPanel && myPanelUpper->isPointIn(theCursor))
 || (myPanelBottom != NULL && int(aRootSizeY * theCursor.y()) > (aRootSizeY - 2 * myPanelBottom->getRectPx().height())
 && theCursor.y() < 1.0)
 || (mySeekBar != NULL && mySeekBar ->isPointIn(theCursor))
 || (myPlayList != NULL && toShowPlayList && myPlayList->isPointIn(theCursor))
- || (myMenuRoot != NULL && myMenuRoot->isActive());
+ || (hasMainMenu && myMenuRoot->isActive());
 if(!myIsVisibleGUI
 && myBtnPlay != NULL
 && myBtnPlay->getFaceId() == 0
@@ -1658,19 +1681,19 @@
 myIsVisibleGUI = true;
 }
 const float anOpacity = (float )myVisLerp.perform(myIsVisibleGUI, false);
- if(theIsMouseMoved) {
+ if(isMouseActive) {
 myVisibilityTimer.restart();
 }
 
 if(myMenuRoot != NULL) {
- myMenuRoot->setOpacity(anOpacity, false);
+ myMenuRoot->setOpacity(hasMainMenu ? anOpacity : 0.0f, false);
+ }
+ if(myPanelUpper != NULL) {
+ myPanelUpper->setOpacity(hasUpperPanel ? anOpacity : 0.0f, true);
 }
 if(mySeekBar != NULL) {
 mySeekBar->setOpacity(anOpacity, false);
 }
- if(myPanelUpper != NULL) {
- myPanelUpper->setOpacity(anOpacity, true);
- }
 if(myPanelBottom != NULL) {
 myPanelBottom->setOpacity(anOpacity, true);
 }
@@ -1680,23 +1703,46 @@
 myPlayList->setOpacity(anOpacity, true);
 }
 
+ const StPlayList::CurrentPosition aCurrPos = myPlugin->myVideo->getPlayList().getCurrentPosition();
+ if(myBtnPrev != NULL) {
+ myBtnPrev->setOpacityScale(aCurrPos == StPlayList::CurrentPosition_Middle
+ || aCurrPos == StPlayList::CurrentPosition_Last ? 1.0f : 0.5f);
+ }
+ if(myBtnNext != NULL) {
+ myBtnNext->setOpacityScale(aCurrPos == StPlayList::CurrentPosition_Middle
+ || aCurrPos == StPlayList::CurrentPosition_First ? 1.0f : 0.5f);
+ }
+ if(myBtnPlay != NULL) {
+ myBtnPlay->setOpacityScale(aCurrPos != StPlayList::CurrentPosition_NONE ? 1.0f : 0.5f);
+ }
+
 StFormat aSrcFormat = (StFormat )myPlugin->params.srcFormat->getValue();
- if(aSrcFormat == StFormat_AUTO
- && !aParams.isNull()) {
+ if( aSrcFormat == StFormat_AUTO
+ && !aParams.isNull()
+ && hasVideo) {
 aSrcFormat = aParams->StereoFormat;
 }
 if(!aParams.isNull()
- && myImage->params.swapLR->getValue()) {
+ && myImage->params.swapLR->getValue()
+ && hasVideo) {
 aSrcFormat = st::formatReversed(aSrcFormat);
 }
 if(myBtnSrcFrmt != NULL) {
- myBtnSrcFrmt->setFaceId(aSrcFormat != StFormat_AUTO ? aSrcFormat : StFormat_Mono);
+ size_t aFaceId = aSrcFormat;
+ if(aSrcFormat == StFormat_AUTO) {
+ aFaceId = hasVideo ? StFormat_Mono : StFormat_NB;
+ }
+ myBtnSrcFrmt->setOpacityScale(hasVideo ? 1.0f : 0.5f);
+ myBtnSrcFrmt->setFaceId(aFaceId);
 }
 if(myBtnFullScr != NULL) {
 myBtnFullScr->setFaceId(myPlugin->params.isFullscreen->getValue() ? 1 : 0);
 }
 if(myBtnSwapLR != NULL) {
- myBtnSwapLR->setOpacity(aSrcFormat != StFormat_Mono ? anOpacity : 0.0f, false);
+ const bool hasInput = hasVideo
+ && aSrcFormat != StFormat_Mono
+ && aSrcFormat != StFormat_AUTO;
+ myBtnSwapLR->setOpacity(hasInput ? anOpacity : 0.0f, false);
 }
 
 const StStereoParams::ViewMode aViewMode = hasVideo && !aParams.isNull()
@@ -1721,7 +1767,7 @@
 myImage->setDeviceOrientation(StGLQuaternion((float )aQ.x(), (float )aQ.y(), (float )aQ.z(), (float )aQ.w()));
 
 if(myDescr != NULL) {
- myDescr->setOpacity(1.0f, false);
+ bool wasEmpty = myDescr->getText().isEmpty();
 if(::isPointIn(myBtnOpen, theCursor)) {
 myDescr->setText(tr(FILE_VIDEO_OPEN));
 } else if(::isPointIn(myBtnInfo, theCursor)) {
@@ -1760,8 +1806,19 @@
 } else if(::isPointIn(myBtnFullScr, theCursor)) {
 myDescr->setText(tr(FULLSCREEN));
 } else {
- myDescr->setOpacity(0.0f, false);
+ myDescr->setText("");
 }
+
+ if(wasEmpty
+ && aStillTime < 1.0) {
+ myDescr->setText("");
+ } else if(getFocus() != NULL
+ || (myMenuRoot != NULL && myMenuRoot->isActive())) {
+ // hide within active dialog - should be replaced by z-layer check
+ myDescr->setText("");
+ }
+
+ myDescr->setOpacity(!myDescr->getText().isEmpty() ? 1.0f : 0.0f, false);
 }
 }
 
@@ -1796,9 +1853,9 @@
 -scale(16), 0, StGLCorner(ST_VCORNER_CENTER, ST_HCORNER_RIGHT));
 aDelayRange->changeRectPx().bottom() = aDelayRange->getRectPx().top() + aBuilder.getMenu()->getItemHeight();
 aDelayRange->setFormat(stCString("%+01.3f"));
- aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Default, StGLVec3(0.0f, 0.0f, 0.0f));
- aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, StGLVec3(0.4f, 0.8f, 0.4f));
- aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, StGLVec3(1.0f, 0.0f, 0.0f));
+ aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Default, aBlack);
+ aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Positive, aGreen);
+ aDelayRange->setColor(StGLRangeFieldFloat32::FieldColor_Negative, aRed);
 }
 aBuilder.getMenu()->addItem(tr(MENU_AUDIO_ATTACH))
 ->setIcon(stCMenuIcon("actionOpen"), false)

sview-15_10.tar.gz/StMoviePlayer/StMoviePlayerGUI.h -> sview-15_11.tar.gz/StMoviePlayer/StMoviePlayerGUI.h Changed

sview-15_10.tar.gz/StMoviePlayer/StVideo/StALContext.cpp -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StALContext.cpp Changed

sview-15_10.tar.gz/StMoviePlayer/StVideo/StALContext.h -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StALContext.h Changed

sview-15_10.tar.gz/StMoviePlayer/StVideo/StAVPacketQueue.cpp -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StAVPacketQueue.cpp Changed

@@ -110,10 +110,7 @@
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
     myGetBuffInit    = myCodecCtx->get_buffer2;
 #endif
-#if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 100))
-    myIsAttachedPic = myStream != NULL
-                  && (myStream->disposition & AV_DISPOSITION_ATTACHED_PIC) != 0;
-#endif
+    myIsAttachedPic = stAV::isAttachedPicture(myStream);
     return true;
 }
 
@@ -138,7 +135,8 @@
     myIsAttachedPic = false;
 }
 
-void StAVPacketQueue::fillCodecInfo(AVCodec* theCodec) {
+void StAVPacketQueue::fillCodecInfo(const AVCodec*  theCodec,
+                                    const StString& theDescExtra) {
     StMutexAuto aLock(myMutexInfo);
     if(theCodec == NULL) {
         myCodecName.clear();
@@ -146,7 +144,7 @@
         myCodecStr.clear();
     } else {
         myCodecName = theCodec->name;
-        myCodecDesc = theCodec->long_name;
+        myCodecDesc = theCodec->long_name + theDescExtra;
         myCodecStr  = StString("[") + myCodecName + stCString("] ") + myCodecDesc;
     }
 }
@@ -247,6 +245,10 @@
             myIsPlaying = false;
             break;
         }
+        case ST_PLAYEVENT_NEXT:
+        case ST_PLAYEVENT_NONE: {
+            break;
+        }
     }
     myPlayEvent = theEventId;
     myEventMutex.unlock();

sview-15_10.tar.gz/StMoviePlayer/StVideo/StAVPacketQueue.h -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StAVPacketQueue.h Changed

sview-15_10.tar.gz/StMoviePlayer/StVideo/StAudioQueue.cpp -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StAudioQueue.cpp Changed

@@ -135,9 +135,14 @@
 }
 
 bool StAudioQueue::stalInit() {
- StHandle<StString> aDevName = myAlDeviceName;
- if(!myAlCtx.create(*aDevName)) {
- if(!myAlCtx.create()) {
+ std::string aDevName;
+ {
+ StMutexAuto aLock(mySwitchMutex);
+ aDevName = myAlDeviceName;
+ }
+ if(!myAlCtx.create(aDevName)) {
+ if(aDevName.empty()
+ || !myAlCtx.create("")) {
 // retry with default device
 return false;
 }
@@ -236,7 +241,7 @@
 return SV_THREAD_RETURN 0;
 }
 
-StAudioQueue::StAudioQueue(const StString& theAlDeviceName)
+StAudioQueue::StAudioQueue(const std::string& theAlDeviceName)
 : StAVPacketQueue(512),
 myPlaybackTimer(false),
 myDowntimeEvent(true),
@@ -248,7 +253,7 @@
 myIsAlValid(ST_AL_INIT_NA),
 myToSwitchDev(false),
 myIsDisconnected(false),
- myAlDeviceName(new StString(theAlDeviceName)),
+ myAlDeviceName(theAlDeviceName),
 myAlFormat(AL_FORMAT_STEREO16),
 myPrevFormat(AL_FORMAT_STEREO16),
 myPrevFrequency(0),
@@ -871,7 +876,7 @@
 return true;
 }
 
- myAlDeviceName = new StString();
+ myAlDeviceName.clear();
 stalDeinit(); // release OpenAL context
 myIsAlValid = (stalInit() ? ST_AL_INIT_OK : ST_AL_INIT_KO);
 myIsDisconnected = true;

sview-15_10.tar.gz/StMoviePlayer/StVideo/StAudioQueue.h -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StAudioQueue.h Changed

@@ -46,7 +46,7 @@
 
 public: //! @name public API
 
- ST_LOCAL StAudioQueue(const StString& theAlDeviceName);
+ ST_LOCAL StAudioQueue(const std::string& theAlDeviceName);
 ST_LOCAL virtual ~StAudioQueue();
 
 ST_LOCAL bool isInDowntime() {
@@ -107,8 +107,9 @@
 /**
 * Switch audio device.
 */
- ST_LOCAL void switchAudioDevice(const StString& theAlDeviceName) {
- myAlDeviceName = new StString(theAlDeviceName);
+ ST_LOCAL void switchAudioDevice(const std::string& theAlDeviceName) {
+ StMutexAuto aLock(mySwitchMutex);
+ myAlDeviceName = theAlDeviceName;
 myToSwitchDev = true;
 }
 
@@ -277,12 +278,13 @@
 StPCMBuffer myBufferOut; //!< output PCM audio buffer
 StTimer myLimitTimer;
 volatile IState_t myIsAlValid; //!< OpenAL initialization state
+ StMutex mySwitchMutex; //!< switch audio device lock
 volatile bool myToSwitchDev; //!< switch audio device flag
 volatile bool myIsDisconnected;//!< audio device disconnection flag
 
 private: //! @name OpenAL items
 
- StHandle<StString> myAlDeviceName; //!< Output audio device name for OpenAL context initialization
+ std::string myAlDeviceName; //!< Output audio device name for OpenAL context initialization
 StALContext myAlCtx; //!< OpenAL context
 ALuint myAlBuffers[NUM_AL_SOURCES][NUM_AL_BUFFERS]; //!< audio buffers
 ALuint myAlSources[NUM_AL_SOURCES]; //!< audio sources

sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideo.cpp -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StVideo.cpp Changed

@@ -37,7 +37,7 @@
 
 const char* StVideo::ST_VIDEOS_MIME_STRING = ST_VIDEO_PLUGIN_MIME_CHAR;
 
-StVideo::StVideo(const StString& theALDeviceName,
+StVideo::StVideo(const std::string& theALDeviceName,
 const StHandle<StTranslations>& theLangMap,
 const StHandle<StPlayList>& thePlayList,
 const StHandle<StGLTextureQueue>& theTextureQueue,
@@ -334,7 +334,8 @@
 myFileInfoTmp->Info.add(StArgument(tr(INFO_DURATION),
 StFormatTime::formatSeconds(theInfo.Duration)));
 }
- } else if(!myVideoSlave->isInitialized()) {
+ } else if(!myVideoSlave->isInitialized()
+ && !stAV::isAttachedPicture(aStream)) {
 myVideoSlave->init(aFormatCtx, aStreamId, "");
 if(myVideoSlave->isInitialized()) {
 mySlaveCtx = aFormatCtx;
@@ -665,11 +666,9 @@
 const bool toSeekBack) {
 const int aFlags = toSeekBack ? AVSEEK_FLAG_BACKWARD : 0;
 AVStream* aStream = theFormatCtx->streams[theStreamId];
-#if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 100))
- if((aStream->disposition & AV_DISPOSITION_ATTACHED_PIC) != 0) {
+ if(stAV::isAttachedPicture(aStream)) {
 return false;
 }
-#endif
 
 int64_t aSeekTarget = stAV::secondsToUnits(aStream, theSeekPts + stAV::unitsToSeconds(aStream, aStream->start_time));
 bool isSeekDone = av_seek_frame(theFormatCtx, theStreamId, aSeekTarget, aFlags) >= 0;
@@ -704,10 +703,11 @@
 const bool toUseGpu = params.UseGpu->getValue();
 const bool toDecodeSlave = myVideoMaster->getStereoFormatByUser() == StFormat_AUTO
 && mySlaveStream >= 0;
+ // keep failed flag
+ const bool isGpuFailed = myVideoMaster->isGpuFailed()
+ || (myVideoSlave->isInitialized() && myVideoSlave->isGpuFailed());
 if(toUseGpu != myVideoMaster->toUseGpu()
 || toDecodeSlave != myVideoSlave->isInitialized()) {
- myVideoMaster->setUseGpu(toUseGpu);
- myVideoSlave ->setUseGpu(toUseGpu);
 doFlush();
 if(myVideoMaster->isInitialized()) {
 const StString aFileNameMaster = myVideoMaster->getFileName();
@@ -728,6 +728,9 @@
 if(myVideoSlave->isInitialized()) {
 myVideoSlave->deinit();
 }
+
+ myVideoMaster->setUseGpu(toUseGpu, isGpuFailed);
+ myVideoSlave ->setUseGpu(toUseGpu, isGpuFailed);
 myVideoMaster->init(aCtxMaster, aStreamIdMaster, aFileNameMaster);
 myVideoMaster->setSlave(NULL);
 if(toDecodeSlave) {
@@ -738,6 +741,9 @@
 if(toDecodeSlave) {
 myVideoSlave->pushStart();
 }
+ } else {
+ myVideoMaster->setUseGpu(toUseGpu);
+ myVideoSlave ->setUseGpu(toUseGpu);
 }
 }
 }

sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideo.h -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StVideo.h Changed

sview-15_11.tar.gz/StMoviePlayer/StVideo/StVideoDxva2.cpp Added

@@ -0,0 +1,701 @@
+/**
+ * Copyright © 2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * StMoviePlayer program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * StMoviePlayer program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "StVideoQueue.h"
+
+#if defined(_WIN32)
+
+#include <StAV/StAVPacket.h>
+#include <StAV/StAVFrame.h>
+#include <StAV/StAVBufferPool.h>
+#include <StLibrary.h>
+
+#include <vector>
+
+#ifdef _MSC_VER
+ // nonstandard extension used : nameless struct/union
+ #pragma warning(disable : 4201)
+#endif
+
+#include <d3d9.h>
+#include <dxva2api.h>
+
+#ifdef _MSC_VER
+ #pragma warning(default : 4201)
+#endif
+
+extern "C" {
+
+ #include <libavcodec/dxva2.h>
+ #include <libavutil/buffer.h>
+ #include <libavutil/imgutils.h>
+
+};
+
+// define all the GUIDs used directly here,
+// to avoid problems with inconsistent dxva2api.h versions in mingw-w64 and different MSVC version
+#include <initguid.h>
+
+DEFINE_GUID(IID_IDirectXVideoDecoderService, 0xfc51a551,0xd5e7,0x11d9,0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);
+
+DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65,0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);
+DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD, 0x86695f12, 0x340e,0x4f04,0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60);
+DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68, 0x4951,0x4C54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
+DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_D2010, 0x1b81beA4, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main, 0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
+DEFINE_GUID(DXVA2_NoEncrypt, 0x1b81beD0, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
+
+struct StDxva2Mode {
+ const GUID* guid;
+ AVCodecID codec;
+
+ StDxva2Mode(const GUID& theGuid,
+ const AVCodecID theCodec)
+ : guid(&theGuid),
+ codec(theCodec) {}
+};
+
+struct StDxva2SurfaceInfo {
+ int used;
+ uint64_t age;
+};
+
+/**
+ * DXVA2 HWAccel context.
+ */
+class StDxva2Context : public StHWAccelContext {
+
+ public:
+
+ /**
+ * Empty constructor.
+ */
+ StDxva2Context()
+ : myDeviceHandle(INVALID_HANDLE_VALUE),
+ myD3d9(NULL),
+ myD3d9Device(NULL),
+ myD3d9DevMgr(NULL),
+ myDecoderService(NULL),
+ myDxvaDecoder(NULL),
+ myDecoderGuid(GUID_NULL),
+ myD3dSurfaces(NULL),
+ mySurfInfos(NULL),
+ myNbSurfaces(0),
+ mySurfaceAge(0),
+ myFrameTmp(NULL) {
+ myD3dLib .loadSimple("d3d9.dll");
+ myDxva2Lib.loadSimple("dxva2.dll");
+ }
+
+ /**
+ * Destructor.
+ */
+ virtual ~StDxva2Context() {
+ release();
+ }
+
+ /**
+ * Release context.
+ */
+ void release();
+
+ /**
+ * Return true if DXVA2 has been successfully initialized.
+ */
+ virtual bool isValid() const { return myDeviceHandle != INVALID_HANDLE_VALUE; }
+
+ /**
+ * Create context.
+ */
+ virtual bool create(StVideoQueue& theVideo);
+
+ /**
+ * Destroy decoder.
+ */
+ virtual void decoderDestroy() {
+ myPoolsTmp[0].release();
+ myPoolsTmp[1].release();
+ myPoolsTmp[2].release();
+
+ if(myD3dSurfaces != NULL) {
+ for(uint32_t aSurfIter = 0; aSurfIter < myNbSurfaces; ++aSurfIter) {
+ if(myD3dSurfaces[aSurfIter] != NULL) {
+ myD3dSurfaces[aSurfIter]->Release();
+ }
+ }
+ }
+ av_freep(&myD3dSurfaces);
+ av_freep(&mySurfInfos);
+ myNbSurfaces = 0;
+ mySurfaceAge = 0;
+
+ if(myDxvaDecoder != NULL) {
+ myDxvaDecoder->Release();
+ myDxvaDecoder = NULL;
+ }
+ }
+
+ /**
+ * Create decoder.
+ */
+ virtual bool decoderCreate(StVideoQueue& theVideo,
+ AVCodecContext* theCodecCtx);
+
+ /**
+ * AVFrame initialization callback.
+ */
+ virtual int getFrameBuffer(StVideoQueue& theVideo,
+ AVFrame* theFrame);
+
+ /**
+ * Fetch decoded results into specified frame.
+ */
+ virtual bool retrieveFrame(StVideoQueue& theVideo,
+ AVFrame* theFrame);
+
+ private:
+
+ struct StDxva2SurfaceWrapper {
+ StDxva2Context* ctx;
+ LPDIRECT3DSURFACE9 surface;
+ IDirectXVideoDecoder* decoder;
+ };
+
+ /**
+ * Buffer release callback.
+ */
+ static void stReleaseBufferDxva2(void* theOpaque,
+ uint8_t* theData) {
+ (void )theData;
+ StDxva2SurfaceWrapper* aWrapper = (StDxva2SurfaceWrapper* )theOpaque;
+ StDxva2Context* aDxvaCtx = aWrapper->ctx;
+ for(uint32_t aSurfIter = 0; aSurfIter < aDxvaCtx->myNbSurfaces; ++aSurfIter) {
+ if(aDxvaCtx->myD3dSurfaces[aSurfIter] == aWrapper->surface) {
+ aDxvaCtx->mySurfInfos[aSurfIter].used = 0;
+ break;
+ }
+ }
+ aWrapper->surface->Release();
+ aWrapper->decoder->Release();
+ av_free(aWrapper);
+ }
+
+ private:
+
+ StLibrary myD3dLib;
+ StLibrary myDxva2Lib;
+
+ HANDLE myDeviceHandle;
+
+ IDirect3D9* myD3d9;
+ IDirect3DDevice9* myD3d9Device;
+ IDirect3DDeviceManager9* myD3d9DevMgr;
+ IDirectXVideoDecoderService* myDecoderService;
+ IDirectXVideoDecoder* myDxvaDecoder;
+
+ GUID myDecoderGuid;
+ DXVA2_ConfigPictureDecode myDecoderConfig;
+
+ IDirect3DSurface9** myD3dSurfaces;
+ StDxva2SurfaceInfo* mySurfInfos;
+ uint32_t myNbSurfaces;
+ uint64_t mySurfaceAge;
+
+ StAVBufferPool myPoolsTmp[3];
+ AVFrame* myFrameTmp;
+ dxva_context myDxvaCtxAV;
+
+ std::vector<StDxva2Mode> myDxvaModes;
+
+};
+
+void StDxva2Context::release() {
+ decoderDestroy();
+ if(myDecoderService != NULL) {
+ myDecoderService->Release();
+ myDecoderService = NULL;
+ }
+ if(myD3d9DevMgr != NULL
+ && myDeviceHandle != INVALID_HANDLE_VALUE) {
+ myD3d9DevMgr->CloseDeviceHandle(myDeviceHandle);
+ myDeviceHandle = INVALID_HANDLE_VALUE;
+ }
+ if(myD3d9DevMgr != NULL) {
+ myD3d9DevMgr->Release();
+ myD3d9DevMgr = NULL;
+ }
+ if(myD3d9Device != NULL) {
+ myD3d9Device->Release();
+ myD3d9Device = NULL;
+ }
+ if(myD3d9 != NULL) {
+ myD3d9->Release();
+ myD3d9 = NULL;
+ }
+ av_frame_free(&myFrameTmp);
+}
+
+bool StDxva2Context::create(StVideoQueue& theVideo) {
+ const StSignal<void (const StCString& )>& onError = theVideo.signals.onError;
+ if(!myD3dLib.isOpened()) {
+ onError(stCString("StVideoQueue: Failed to load D3D9 library"));
+ release();
+ return false;
+ } else if(!myDxva2Lib.isOpened()) {
+ onError(stCString("StVideoQueue: Failed to load DXVA2 library"));
+ release();
+ return false;
+ }
+
+ typedef IDirect3D9* (WINAPI *Direct3DCreate9_t)(UINT);
+ typedef HRESULT (WINAPI *DXVA2CreateDirect3DDeviceManager9_t)(UINT* , IDirect3DDeviceManager9** );
+ Direct3DCreate9_t aCreateD3dProc = NULL;
+ DXVA2CreateDirect3DDeviceManager9_t aCreateDevMgrProc = NULL;
+ if(!myD3dLib.find("Direct3DCreate9", aCreateD3dProc)) {
+ onError(stCString("StVideoQueue: Failed to locate Direct3DCreate9"));
+ release();
+ return false;
+ }
+ if(!myDxva2Lib.find("DXVA2CreateDirect3DDeviceManager9", aCreateDevMgrProc)) {
+ onError(stCString("StVideoQueue: Failed to locate DXVA2CreateDirect3DDeviceManager9"));
+ release();
+ return false;
+ }
+
+ myD3d9 = aCreateD3dProc(D3D_SDK_VERSION);
+ if(myD3d9 == NULL) {
+ onError(stCString("StVideoQueue: Failed to create IDirect3D object"));
+ release();
+ return false;
+ }
+
+ D3DDISPLAYMODE aD3dDispMode;
+ UINT anAdapter = D3DADAPTER_DEFAULT;
+ myD3d9->GetAdapterDisplayMode(anAdapter, &aD3dDispMode);
+ D3DPRESENT_PARAMETERS aD3dParams = {0};
+ aD3dParams.Windowed = TRUE;
+ aD3dParams.BackBufferWidth = 2;
+ aD3dParams.BackBufferHeight = 2;
+ aD3dParams.BackBufferCount = 0;
+ aD3dParams.BackBufferFormat = aD3dDispMode.Format;
+ aD3dParams.SwapEffect = D3DSWAPEFFECT_DISCARD;
+ aD3dParams.Flags = D3DPRESENTFLAG_VIDEO;
+
+ HRESULT aHRes = myD3d9->CreateDevice(anAdapter, D3DDEVTYPE_HAL, GetDesktopWindow(),
+ D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
+ &aD3dParams, &myD3d9Device);
+ if(aHRes != D3D_OK) {
+ onError(stCString("StVideoQueue: Failed to create Direct3D device"));
+ release();
+ return false;
+ }
+
+ unsigned aResetToken = 0;
+ aHRes = aCreateDevMgrProc(&aResetToken, &myD3d9DevMgr);
+ if(aHRes != S_OK) {
+ onError(stCString("StVideoQueue: Failed to create Direct3D device manager"));
+ release();
+ return false;
+ }
+
+ aHRes = myD3d9DevMgr->ResetDevice(myD3d9Device, aResetToken);
+ if(aHRes != S_OK) {
+ onError(stCString("StVideoQueue: Failed to bind Direct3D device to device manager"));
+ release();
+ return false;
+ }
+
+ aHRes = myD3d9DevMgr->OpenDeviceHandle(&myDeviceHandle);
+ if(aHRes != S_OK) {
+ onError(stCString("StVideoQueue: Failed to open device handle"));
+ release();
+ return false;
+ }
+
+ aHRes = myD3d9DevMgr->GetVideoService(myDeviceHandle, IID_IDirectXVideoDecoderService, (void** )&myDecoderService);
+ if(aHRes != S_OK) {
+ onError(stCString("StVideoQueue: Failed to create IDirectXVideoDecoderService"));
+ release();
+ return false;
+ }
+
+ myFrameTmp = av_frame_alloc();
+ if(myFrameTmp == NULL) {
+ release();
+ return false;
+ }
+
+ // MPEG-2
+ myDxvaModes.clear();
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeMPEG2_VLD, theVideo.CodecIdMPEG2));
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeMPEG2and1_VLD, theVideo.CodecIdMPEG2));
+ // H.264
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeH264_F, theVideo.CodecIdH264));
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeH264_E, theVideo.CodecIdH264));
+ // Intel specific H.264 mode
+ myDxvaModes.push_back(StDxva2Mode(DXVADDI_Intel_ModeH264_E, theVideo.CodecIdH264));
+ // VC-1 / WMV3
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeVC1_D2010, theVideo.CodecIdVC1));
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeVC1_D2010, theVideo.CodecIdWMV3));
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeVC1_D, theVideo.CodecIdVC1));
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeVC1_D, theVideo.CodecIdWMV3));
+ // HEVC/H.265
+ myDxvaModes.push_back(StDxva2Mode(DXVA2_ModeHEVC_VLD_Main, theVideo.CodecIdHEVC));
+ return true;
+}
+
+int StDxva2Context::getFrameBuffer(StVideoQueue& theVideo,
+ AVFrame* theFrame) {
+ if( theFrame->format != stAV::PIX_FMT::DXVA2_VLD
+ || !isValid()) {
+ return -1;
+ }
+
+ uint32_t anOldUnused = uint32_t(-1);
+ for(uint32_t aSurfIter = 0; aSurfIter < myNbSurfaces; ++aSurfIter) {
+ StDxva2SurfaceInfo* info = &mySurfInfos[aSurfIter];
+ if(!info->used
+ && (anOldUnused == uint32_t(-1) || info->age < mySurfInfos[anOldUnused].age)) {
+ anOldUnused = aSurfIter;
+ }
+ }
+ if(anOldUnused == -1) {
+ theVideo.signals.onError(stCString("StVideoQueue: No free DXVA2 surface!"));
+ return AVERROR(ENOMEM);
+ }
+ const uint32_t aSurfId = anOldUnused;
+ IDirect3DSurface9* aSurface = myD3dSurfaces[aSurfId];
+
+ StDxva2SurfaceWrapper* aWrapper = (StDxva2SurfaceWrapper* )av_mallocz(sizeof(StDxva2SurfaceWrapper));
+ if(aWrapper == NULL) {
+ return AVERROR(ENOMEM);
+ }
+
+ theFrame->buf[0] = av_buffer_create((uint8_t* )aSurface, 0,
+ stReleaseBufferDxva2, aWrapper,
+ AV_BUFFER_FLAG_READONLY);
+ if(!theFrame->buf[0]) {
+ av_free(aWrapper);
+ return AVERROR(ENOMEM);
+ }
+
+ aWrapper->ctx = this;
+ aWrapper->surface = aSurface;
+ aWrapper->surface->AddRef();
+ aWrapper->decoder = myDxvaDecoder;
+ aWrapper->decoder->AddRef();
+
+ mySurfInfos[aSurfId].used = 1;
+ mySurfInfos[aSurfId].age = mySurfaceAge++;
+
+ theFrame->data[3] = (uint8_t* )aSurface;
+ return 0;
+}
+
+bool StDxva2Context::retrieveFrame(StVideoQueue& theVideo,
+ AVFrame* theFrame) {
+ if(!isValid()
+ || theFrame->format != stAV::PIX_FMT::DXVA2_VLD) {
+ return false;
+ }
+
+ IDirect3DSurface9* aSurface = (IDirect3DSurface9* )theFrame->data[3];
+ D3DSURFACE_DESC aSurfDesc;
+ aSurface->GetDesc(&aSurfDesc);
+
+ av_frame_unref(myFrameTmp);
+ myFrameTmp->width = theFrame->width;
+ myFrameTmp->height = theFrame->height;
+ //myFrameTmp->format = stAV::PIX_FMT::NV12;
+ myFrameTmp->format = stAV::PIX_FMT::YUV420P;
+ const int aHeightUV = theFrame->height / 2;
+ const int aWidthUV = theFrame->width / 2;
+
+ myFrameTmp->linesize[0] = (int )getAligned(theFrame->width, 32);
+ myFrameTmp->linesize[1] = (int )getAligned(aWidthUV, 32);
+ myFrameTmp->linesize[2] = (int )getAligned(aWidthUV, 32);
+
+ const int aBufSizeY = myFrameTmp->linesize[0] * theFrame->height;
+ const int aBufSizeU = myFrameTmp->linesize[1] * aHeightUV;
+ if(myPoolsTmp[0].init(aBufSizeY)
+ && myPoolsTmp[1].init(aBufSizeU)
+ && myPoolsTmp[2].init(aBufSizeU)) {
+ myFrameTmp->buf[0] = myPoolsTmp[0].getBuffer();
+ myFrameTmp->buf[1] = myPoolsTmp[1].getBuffer();
+ myFrameTmp->buf[2] = myPoolsTmp[2].getBuffer();
+ if(myFrameTmp->buf[0] == NULL
+ || myFrameTmp->buf[1] == NULL
+ || myFrameTmp->buf[2] == NULL) {
+ ST_ERROR_LOG("StDxva2Context: unable to allocate YUV420P frame buffers");
+ return false;
+ }
+
+ myFrameTmp->data[0] = myFrameTmp->buf[0]->data;
+ myFrameTmp->data[1] = myFrameTmp->buf[1]->data;
+ myFrameTmp->data[2] = myFrameTmp->buf[2]->data;
+ } else if(av_frame_get_buffer(myFrameTmp, 32) < 0) {
+ ST_ERROR_LOG("StDxva2Context: unable to allocate YUV420P frame buffers");
+ return false;
+ }
+
+ D3DLOCKED_RECT aLockRect;
+ if(aSurface->LockRect(&aLockRect, NULL, D3DLOCK_READONLY) != D3D_OK) {
+ theVideo.signals.onError(stCString("StVideoQueue: Unable to lock DXVA2 surface"));
+ return false;
+ }
+
+ av_image_copy_plane(myFrameTmp->data[0], myFrameTmp->linesize[0],
+ (uint8_t* )aLockRect.pBits,
+ aLockRect.Pitch, theFrame->width, theFrame->height);
+ //av_image_copy_plane(myFrameTmp->data[1], myFrameTmp->linesize[1],
+ // (uint8_t* )aLockRect.pBits + aLockRect.Pitch * aSurfDesc.Height,
+ // aLockRect.Pitch, theFrame->width, theFrame->height / 2);
+ const uint8_t* aSrcPlaneUV = (const uint8_t* )aLockRect.pBits + aLockRect.Pitch * aSurfDesc.Height;
+ for(int aRow = 0; aRow < aHeightUV; ++aRow) {
+ const uint8_t* aSrcRowUV = aSrcPlaneUV + aRow * aLockRect.Pitch;
+ uint8_t* aDstRowU = myFrameTmp->data[1] + myFrameTmp->linesize[1] * aRow;
+ uint8_t* aDstRowV = myFrameTmp->data[2] + myFrameTmp->linesize[2] * aRow;
+ for(int aCol = 0; aCol < aWidthUV; ++aCol) {
+ const uint8_t* aSrcUV = aSrcRowUV + aCol * 2;
+ aDstRowU[aCol] = aSrcUV[0];
+ aDstRowV[aCol] = aSrcUV[1];
+ }
+ }
+
+ aSurface->UnlockRect();
+
+ int aRes = av_frame_copy_props(myFrameTmp, theFrame);
+ if(aRes < 0) {
+ av_frame_unref(myFrameTmp);
+ return false;
+ }
+
+ av_frame_unref (theFrame);
+ av_frame_move_ref(theFrame, myFrameTmp);
+ return true;
+}
+
+bool StDxva2Context::decoderCreate(StVideoQueue& theVideo,
+ AVCodecContext* theCodecCtx) {
+ const StSignal<void (const StCString& )>& onError = theVideo.signals.onError;
+ decoderDestroy();
+ theCodecCtx->hwaccel_context = NULL;
+
+ uint32_t aNbGuids = 0;
+ GUID* aGuidList = NULL;
+ if(myDecoderService->GetDecoderDeviceGuids(&aNbGuids, &aGuidList) != S_OK) {
+ onError(stCString("StVideoQueue: Failed to retrieve decoder DXVA2 device GUIDs"));
+ decoderDestroy();
+ return false;
+ }
+
+ GUID aDeviceGuid = GUID_NULL;
+ D3DFORMAT aTargetD3dFormat = D3DFMT_UNKNOWN;
+ for(std::vector<StDxva2Mode>::const_iterator aModeIter = myDxvaModes.begin();
+ aModeIter != myDxvaModes.end(); ++aModeIter) {
+ const StDxva2Mode& aMode = *aModeIter;
+ if(aMode.codec != theCodecCtx->codec_id) {
+ continue;
+ }
+
+ uint32_t aGuidIter = 0;
+ for(; aGuidIter < aNbGuids; ++aGuidIter) {
+ if(::IsEqualGUID(*aMode.guid, aGuidList[aGuidIter])) {
+ break;
+ }
+ }
+ if(aGuidIter == aNbGuids) {
+ continue;
+ }
+
+ uint32_t aNbD3dTargets = 0;
+ D3DFORMAT* aD3dTargetList = NULL;
+ if(myDecoderService->GetDecoderRenderTargets(*aMode.guid, &aNbD3dTargets, &aD3dTargetList) != S_OK) {
+ continue;
+ }
+
+ for(uint32_t aTargetIter = 0; aTargetIter < aNbD3dTargets; ++aTargetIter) {
+ const D3DFORMAT aD3dFormat = aD3dTargetList[aTargetIter];
+ if(aD3dFormat == MKTAG('N','V','1','2')) {
+ aTargetD3dFormat = aD3dFormat;
+ break;
+ }
+ }
+ ::CoTaskMemFree(aD3dTargetList);
+ if(aTargetD3dFormat != D3DFMT_UNKNOWN) {
+ aDeviceGuid = *aMode.guid;
+ break;
+ }
+ }
+ ::CoTaskMemFree(aGuidList);
+
+ if(::IsEqualGUID(aDeviceGuid, GUID_NULL)) {
+ onError(stCString("StVideoQueue: No DXVA2 decoder device for codec found"));
+ decoderDestroy();
+ return false;
+ }
+
+ DXVA2_VideoDesc aDesc = { 0 };
+ aDesc.SampleWidth = theCodecCtx->coded_width;
+ aDesc.SampleHeight = theCodecCtx->coded_height;
+ aDesc.Format = aTargetD3dFormat;
+
+ uint32_t aNbConfigs = 0;
+ uint32_t aBestScore = 0;
+ DXVA2_ConfigPictureDecode* aCfgList = NULL;
+ DXVA2_ConfigPictureDecode aBestCfg = {{0}};
+ if(myDecoderService->GetDecoderConfigurations(aDeviceGuid, &aDesc, NULL, &aNbConfigs, &aCfgList) != S_OK) {
+ onError(stCString("StVideoQueue: Unable to retrieve DXVA2 decoder configurations"));
+ decoderDestroy();
+ return false;
+ }
+
+ for(uint32_t aCfgIter = 0; aCfgIter < aNbConfigs; ++aCfgIter) {
+ const DXVA2_ConfigPictureDecode& aCfg = aCfgList[aCfgIter];
+ uint32_t aScore = 0;
+ if(aCfg.ConfigBitstreamRaw == 1) {
+ aScore = 1;
+ } else if(theCodecCtx->codec_id == theVideo.CodecIdH264
+ && aCfg.ConfigBitstreamRaw == 2) {
+ aScore = 2;
+ } else {
+ continue;
+ }
+
+ if(::IsEqualGUID(aCfg.guidConfigBitstreamEncryption, DXVA2_NoEncrypt)) {
+ aScore += 16;
+ }
+ if(aScore > aBestScore) {
+ aBestScore = aScore;
+ aBestCfg = aCfg;
+ }
+ }
+ ::CoTaskMemFree(aCfgList);
+ if(aBestScore == 0) {
+ onError(stCString("StVideoQueue: No valid DXVA2 decoder configuration available"));
+ decoderDestroy();
+ return false;
+ }
+
+ // decoding MPEG-2 requires additional alignment on some Intel GPUs,
+ // but it causes issues for H.264 on certain AMD GPUs...
+ int aSurfaceAlignment = 16;
+ if(theCodecCtx->codec_id == theVideo.CodecIdMPEG2) {
+ aSurfaceAlignment = 32;
+ // the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure
+ // all coding features have enough room to work with
+ } else if(theCodecCtx->codec_id == theVideo.CodecIdHEVC) {
+ aSurfaceAlignment = 128;
+ }
+
+ // 4 base work surfaces
+ myNbSurfaces = 4;
+
+ // add surfaces based on number of possible refs
+ if((theCodecCtx->codec_id == theVideo.CodecIdH264)
+ || (theCodecCtx->codec_id == theVideo.CodecIdHEVC)) {
+ myNbSurfaces += 16;
+ } else {
+ myNbSurfaces += 2;
+ }
+
+ // add extra surfaces for frame threading
+ if(theCodecCtx->active_thread_type & FF_THREAD_FRAME) {
+ myNbSurfaces += theCodecCtx->thread_count;
+ }
+
+ myD3dSurfaces = (IDirect3DSurface9** )av_mallocz(myNbSurfaces * sizeof(*myD3dSurfaces));
+ mySurfInfos = (StDxva2SurfaceInfo* )av_mallocz(myNbSurfaces * sizeof(*mySurfInfos));
+ if(myD3dSurfaces == NULL
+ || mySurfInfos == NULL) {
+ ST_ERROR_LOG(stCString("StVideoQueue: Unable to allocate surface arrays"));
+ decoderDestroy();
+ return false;
+ }
+
+ HRESULT anHRes = myDecoderService->CreateSurface(FFALIGN(theCodecCtx->coded_width, aSurfaceAlignment),
+ FFALIGN(theCodecCtx->coded_height, aSurfaceAlignment),
+ myNbSurfaces - 1,
+ aTargetD3dFormat, D3DPOOL_DEFAULT, 0,
+ DXVA2_VideoDecoderRenderTarget,
+ myD3dSurfaces, NULL);
+ if(anHRes != S_OK) {
+ onError(StString("StVideoQueue: Failed to create ") + myNbSurfaces + " video surfaces");
+ decoderDestroy();
+ return false;
+ }
+
+ anHRes = myDecoderService->CreateVideoDecoder(aDeviceGuid,
+ &aDesc, &aBestCfg, myD3dSurfaces,
+ myNbSurfaces, &myDxvaDecoder);
+ if(anHRes != S_OK) {
+ onError(stCString("StVideoQueue: Failed to create DXVA2 video decoder"));
+ decoderDestroy();
+ return false;
+ }
+
+ myDecoderGuid = aDeviceGuid;
+ myDecoderConfig = aBestCfg;
+
+ theCodecCtx->hwaccel_context = &myDxvaCtxAV;
+ stMemZero(&myDxvaCtxAV, sizeof(myDxvaCtxAV));
+ myDxvaCtxAV.cfg = &myDecoderConfig;
+ myDxvaCtxAV.decoder = myDxvaDecoder;
+ myDxvaCtxAV.surface = myD3dSurfaces;
+ myDxvaCtxAV.surface_count = myNbSurfaces;
+ myDxvaCtxAV.workaround = 0;
+ if(::IsEqualGUID(myDecoderGuid, DXVADDI_Intel_ModeH264_E)) {
+ myDxvaCtxAV.workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
+ }
+
+ return true;
+}
+
+bool StVideoQueue::hwaccelInit() {
+ if(!myHWAccelCtx.isNull()
+ && !myHWAccelCtx->isValid()) {
+ return false;
+ } else if(myCodecCtx->codec_id == AV_CODEC_ID_NONE) {
+ return false;
+ }
+
+ if(myCodecCtx->codec_id == CodecIdH264
+ && (myCodecCtx->profile & ~FF_PROFILE_H264_CONSTRAINED) > FF_PROFILE_H264_HIGH) {
+ signals.onError(StString("StVideoQueue: Unsupported H.264 profile for DXVA2 HWAccel: ") + myCodecCtx->profile);
+ return false;
+ }
+
+ if(myHWAccelCtx.isNull()) {
+ myHWAccelCtx = new StDxva2Context();
+ if(!myHWAccelCtx->create(*this)) {
+ return false;
+ }
+ }
+
+ if(!myHWAccelCtx->decoderCreate(*this, myCodecCtx)) {
+ return false;
+ }
+ fillCodecInfo(myCodecCtx->codec, " (DXVA2)");
+ return true;
+}
+
+#endif // _WIN32

sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideoQueue.cpp -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StVideoQueue.cpp Changed

@@ -38,36 +38,18 @@
 }
 #endif
 
-#ifdef ST_AV_OLDSYNC
+#if(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 0, 0))
 /**
- * These are called whenever we allocate a frame
- * buffer. We use this to store the global_pts in
- * a frame at the time it is allocated.
+ * Release the frame buffer (old API).
 */
- static int ourGetBuffer(AVCodecContext* theCodecCtx,
- AVFrame* theFrame) {
- StVideoQueue* aVideoQueue = (StVideoQueue* )theCodecCtx->opaque;
- const int aResult = avcodec_default_get_buffer(theCodecCtx, theFrame);
- #ifdef ST_USE64PTR
- theFrame->opaque = (void* )aVideoQueue->getVideoPktPts();
- #else
- int64_t* aPts = new int64_t();
- *aPts = aVideoQueue->getVideoPktPts();
- theFrame->opaque = aPts;
- #endif
- return aResult;
- }
-
- static void ourReleaseBuffer(AVCodecContext* theCodecCtx,
- AVFrame* theFrame) {
+ static void stReleaseFrameBuffer(AVCodecContext* theCodecCtx,
+ AVFrame* theFrame) {
+ #if defined(ST_AV_OLDSYNC) && !ST_USE64PTR
 if(theFrame != NULL) {
- #ifdef ST_USE64PTR
- theFrame->opaque = (void* )stAV::NOPTS_VALUE;
- #else
 delete (int64_t* )theFrame->opaque;
 theFrame->opaque = NULL;
- #endif
 }
+ #endif
 avcodec_default_release_buffer(theCodecCtx, theFrame);
 }
 #endif
@@ -81,23 +63,103 @@
 return SV_THREAD_RETURN 0;
 }
 
-};
+}
+
+AVPixelFormat StVideoQueue::getFrameFormat(const AVPixelFormat* theFormats) {
+ if(!myUseGpu || myIsGpuFailed) {
+ return avcodec_default_get_format(myCodecCtx, theFormats);
+ }
+
+ for(const AVPixelFormat* aFormatIter = theFormats; *aFormatIter != -1; ++aFormatIter) {
+ /*const AVPixFmtDescriptor* aDesc = av_pix_fmt_desc_get(*aFormatIter);
+ if(!(aDesc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
+ return *aFormatIter;
+ }*/
+
+ #if defined(_WIN32)
+ if(*aFormatIter == stAV::PIX_FMT::DXVA2_VLD) {
+ if(!hwaccelInit()) {
+ myIsGpuFailed = true;
+ return avcodec_default_get_format(myCodecCtx, theFormats);
+ }
+ return *aFormatIter;
+ }
+ #endif
+ }
+
+ return *theFormats;
+}
+
+int StVideoQueue::getFrameBuffer(AVFrame* theFrame,
+ int theFlags) {
+ int aResult = 0;
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+ bool isDone = false;
+ #if defined(_WIN32)
+ if(theFrame->format == stAV::PIX_FMT::DXVA2_VLD) {
+ if(!myHWAccelCtx.isNull()) {
+ aResult = myHWAccelCtx->getFrameBuffer(*this, theFrame);
+ } else {
+ aResult = -1;
+ }
+ isDone = true;
+ }
+ #endif
+ if(!isDone) {
+ aResult = avcodec_default_get_buffer2(myCodecCtx, theFrame, theFlags);
+ }
+
+ #ifdef ST_AV_OLDSYNC
+ #ifdef ST_USE64PTR
+ theFrame->opaque = (void* )myVideoPktPts;
+ #else
+ AVFrameSideData* aSideDataSync = av_frame_new_side_data(theFrame, (AVFrameSideDataType )1000, sizeof(myVideoPktPts));
+ if(aSideDataSync != NULL) {
+ memcpy(aSideDataSync->data, &myVideoPktPts, sizeof(myVideoPktPts));
+ }
+ #endif
+ #endif
+#else
+ aResult = avcodec_default_get_buffer(myCodecCtx, theFrame);
+ #ifdef ST_AV_OLDSYNC
+ #ifdef ST_USE64PTR
+ theFrame->opaque = (void* )myVideoPktPts;
+ #else
+ int64_t* aPts = new int64_t();
+ *aPts = myVideoPktPts;
+ theFrame->opaque = aPts;
+ #endif
+ #endif
+#endif
+ return aResult;
+}
+
+#if !defined(_WIN32)
+bool StVideoQueue::hwaccelInit() { return false; }
+#endif
+
+inline AVCodecID stFindCodecId(const char* theName) {
+ AVCodec* aCodec = avcodec_find_decoder_by_name(theName);
+ return aCodec != NULL ? aCodec->id : AV_CODEC_ID_NONE;
+}
 
 StVideoQueue::StVideoQueue(const StHandle<StGLTextureQueue>& theTextureQueue,
 const StHandle<StVideoQueue>& theMaster)
 : StAVPacketQueue(512),
+ CodecIdH264 (stFindCodecId("h264")),
+ CodecIdHEVC (stFindCodecId("hevc")),
+ CodecIdMPEG2(stFindCodecId("mpeg2video")),
+ CodecIdWMV3 (stFindCodecId("wmv3")),
+ CodecIdVC1 (stFindCodecId("vc1")),
 myDowntimeState(true),
 myTextureQueue(theTextureQueue),
 myHasDataState(false),
 myMaster(theMaster),
-#if defined(_WIN32)
- myCodecDxva264(avcodec_find_decoder_by_name("h264_dxva2")),
- myCodecDxvaWmv(avcodec_find_decoder_by_name("wmv3_dxva2")),
- myCodecDxvaVc1(avcodec_find_decoder_by_name("vc1_dxva2")),
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
 myCodecVda(avcodec_find_decoder_by_name("h264_vda")),
 #endif
 myUseGpu(false),
+ myIsGpuFailed(false),
 //
 myToRgbCtx(NULL),
 myToRgbPixFmt(stAV::PIX_FMT::NONE),
@@ -118,12 +180,16 @@
 myStFormatByUser(StFormat_AUTO),
 myStFormatByName(StFormat_AUTO),
 myStFormatInStream(StFormat_AUTO) {
-
 #ifdef ST_USE64PTR
 myFrame.Frame->opaque = (void* )stAV::NOPTS_VALUE;
 #else
 myFrame.Frame->opaque = NULL;
 #endif
+
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ myFrameBufRef = new StAVFrameCounter();
+#endif
+
 myThread = new StThread(threadFunction, (void* )this, theMaster.isNull() ? "StVideoQueueM" : "StVideoQueueS");
 }
 
@@ -137,6 +203,7 @@
 myThread.nullify();
 
 deinit();
+ myHWAccelCtx.nullify();
 }
 
 namespace {
@@ -173,31 +240,33 @@
 {StFormat_AUTO, NULL}
 };
 
-};
+}
+
+bool StVideoQueue::initCodec(AVCodec* theCodec,
+ const bool theToUseGpu) {
+ // close previous codec
+ if(myCodec != NULL) {
+ avcodec_close(myCodecCtx);
+ fillCodecInfo(NULL);
+ }
+ myCodec = NULL;
 
-bool StVideoQueue::initCodec(AVCodec* theCodec) {
 // configure the codec
 myCodecCtx->codec_id = theCodec->id;
- //myCodecCtx->debug_mv = debug_mv;
- //myCodecCtx->debug = debug;
- //myCodecCtx->workaround_bugs = workaround_bugs;
- //myCodecCtx->lowres = 1;
- //if(lowres) myCodecCtx->flags |= CODEC_FLAG_EMU_EDGE;
- //myCodecCtx->idct_algo= idct;
- //if(fast) myCodecCtx->flags2 |= CODEC_FLAG2_FAST;
- //myCodecCtx->skip_idct= skip_idct;
- //myCodecCtx->skip_loop_filter= skip_loop_filter;
- //myCodecCtx->error_recognition= error_recognition;
- //myCodecCtx->error_concealment= error_concealment;
- int threadsCount = StThread::countLogicalProcessors();
- myCodecCtx->thread_count = threadsCount;
+ stAV::meta::Dict* anOpts = NULL;
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ av_dict_set(&anOpts, "refcounted_frames", "1", 0);
+#endif
+
+ int aNbThreads = theToUseGpu ? 1 : StThread::countLogicalProcessors();
+ myCodecCtx->thread_count = aNbThreads;
 #if(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 112, 0))
- avcodec_thread_init(myCodecCtx, threadsCount);
+ avcodec_thread_init(myCodecCtx, aNbThreads);
 #endif
 
 // open codec
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0))
- if(avcodec_open2(myCodecCtx, theCodec, NULL) < 0) {
+ if(avcodec_open2(myCodecCtx, theCodec, &anOpts) < 0) {
 #else
 if(avcodec_open(myCodecCtx, theCodec) < 0) {
 #endif
@@ -206,7 +275,7 @@
 
 myCodec = theCodec;
 fillCodecInfo(theCodec);
- ST_DEBUG_LOG("FFmpeg: Setup AVcodec to use " + threadsCount + " threads");
+ ST_DEBUG_LOG("FFmpeg: Setup AVcodec to use " + aNbThreads + " threads");
 return true;
 }
 
@@ -231,6 +300,15 @@
 #endif
 
 // find the decoder for the video stream
+ myCodecCtx->opaque = this;
+ myCodecCtx->get_format = stGetFrameFormat;
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+ myCodecCtx->get_buffer2 = stGetFrameBuffer2;
+#else
+ myCodecCtx->get_buffer = stGetFrameBuffer1;
+ myCodecCtx->release_buffer = stReleaseFrameBuffer;
+#endif
+
 myCodecAuto = avcodec_find_decoder(myCodecCtx->codec_id);
 if(myCodecAuto == NULL) {
 signals.onError(stCString("FFmpeg: Video codec not found"));
@@ -238,43 +316,44 @@
 return false;
 }
 
+#if defined(_WIN32)
+ myIsGpuFailed = myCodecCtx->codec_id != CodecIdMPEG2
+ && myCodecCtx->codec_id != CodecIdH264
+ && myCodecCtx->codec_id != CodecIdVC1
+ && myCodecCtx->codec_id != CodecIdWMV3
+ && myCodecCtx->codec_id != CodecIdVC1
+ && myCodecCtx->codec_id != CodecIdHEVC;
+#endif
+
+ // open VIDEO codec
+#if defined(__APPLE__)
 bool isCodecOverridden = false;
 AVCodec* aCodecGpu = NULL;
- if(myUseGpu) {
- #if defined(_WIN32)
- if(StString(myCodecAuto->name).isEquals(stCString("h264"))) {
- aCodecGpu = myCodecDxva264;
- } else if(StString(myCodecAuto->name).isEquals(stCString("wmv3"))) {
- aCodecGpu = myCodecDxvaWmv;
- } else if(StString(myCodecAuto->name).isEquals(stCString("vc1"))) {
- aCodecGpu = myCodecDxvaVc1;
- }
- #elif defined(__APPLE__)
- if(StString(myCodecAuto->name).isEquals(stCString("h264"))
- && myCodecCtx->pix_fmt == stAV::PIX_FMT::YUV420P) {
- aCodecGpu = myCodecVda;
- }
- #endif
+ if(myUseGpu
+ && StString(myCodecAuto->name).isEquals(stCString("h264"))
+ && myCodecCtx->pix_fmt == stAV::PIX_FMT::YUV420P) {
+ aCodecGpu = myCodecVda;
 }
 
 if(aCodecGpu != NULL) {
- #if defined(__APPLE__)
 myCodecCtx->get_format = stGetFormatYUV420P;
- #endif
- isCodecOverridden = initCodec(aCodecGpu);
- #if defined(__APPLE__)
+ isCodecOverridden = initCodec(aCodecGpu, true);
 if(!isCodecOverridden) {
 myCodecCtx->get_format = myGetFrmtInit;
 }
- #endif
 }
-
- // open VIDEO codec
- if(!isCodecOverridden && !initCodec(myCodecAuto)) {
+ if(!isCodecOverridden && !initCodec(myCodecAuto, false)) {
 signals.onError(stCString("FFmpeg: Could not open video codec"));
 deinit();
 return false;
 }
+#else
+ if(!initCodec(myCodecAuto, myUseGpu && !myIsGpuFailed)) {
+ signals.onError(stCString("FFmpeg: Could not open video codec"));
+ deinit();
+ return false;
+ }
+#endif
 
 // determine required myFrameRGB size and allocate it
 if(sizeX() == 0 || sizeY() == 0) {
@@ -348,17 +427,11 @@
 myPixelRatio *= 0.5;
 }
 }
-
-#ifdef ST_AV_OLDSYNC
- // override buffers' functions for getting true PTS rootines
- myCodecCtx->opaque = this;
- myCodecCtx->get_buffer = ourGetBuffer;
- myCodecCtx->release_buffer = ourReleaseBuffer;
-#endif
 return true;
 }
 
 void StVideoQueue::deinit() {
+ myIsGpuFailed = false;
 if(myMaster.isNull()) {
 myTextureQueue->clear();
 myTextureQueue->setConnectedStream(false);
@@ -381,6 +454,12 @@
 myCodecCtx->codec_id = myCodecAuto->id;
 }
 StAVPacketQueue::deinit();
+ if(myCodecCtx != NULL) {
+ myCodecCtx->hwaccel_context = NULL;
+ }
+ if(!myHWAccelCtx.isNull()) {
+ myHWAccelCtx->decoderDestroy();
+ }
 }
 
 #ifdef ST_AV_OLDSYNC
@@ -408,6 +487,7 @@
 PixelFormat aPixFmt = stAV::PIX_FMT::NONE;
 stAV::dimYUV aDimsYUV;
 myFrame.getImageInfo(myCodecCtx, aFrameSizeX, aFrameSizeY, aPixFmt);
+ myDataAdp.setBufferCounter(NULL);
 if(aPixFmt == stAV::PIX_FMT::RGB24) {
 myDataAdp.setColorModel(StImage::ImgColor_RGB);
 myDataAdp.setColorScale(StImage::ImgScale_Full);
@@ -461,6 +541,9 @@
 size_t(aDimsYUV.widthU), size_t(aDimsYUV.heightU), myFrame.getLineSize(1));
 myDataAdp.changePlane(2).initWrapper(aPlaneFrmt, myFrame.getPlane(2),
 size_t(aDimsYUV.widthV), size_t(aDimsYUV.heightV), myFrame.getLineSize(2));
+
+ myFrameBufRef->moveReferenceFrom(myFrame.Frame);
+ myDataAdp.setBufferCounter(myFrameBufRef);
 } else if(!myToRgbIsBroken) {
 if(myToRgbCtx == NULL
 || myToRgbPixFmt != aPixFmt
@@ -636,7 +719,19 @@
 
 // decode video frame
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0))
+ bool toTryGpu = myUseGpu && !myIsGpuFailed;
 avcodec_decode_video2(myCodecCtx, myFrame.Frame, &isFrameFinished, aPacket->getAVpkt());
+ bool isGpuUsed = myUseGpu && !myIsGpuFailed;
+ if(isGpuUsed != toTryGpu) {
+ if(!initCodec(myCodecAuto, isGpuUsed)) {
+ signals.onError(stCString("FFmpeg: Could not re-open video codec"));
+ deinit();
+ aPacket.nullify();
+ continue;
+ }
+ isFrameFinished = 0;
+ avcodec_decode_video2(myCodecCtx, myFrame.Frame, &isFrameFinished, aPacket->getAVpkt());
+ }
 #else
 avcodec_decode_video(myCodecCtx, myFrame.Frame, &isFrameFinished,
 aPacket->getData(), aPacket->getSize());
@@ -663,20 +758,22 @@
 // Save global pts to be stored in pFrame in first call
 myVideoPktPts = aPacket->getPts();
 
- #ifdef ST_USE64PTR
- if(aPacket->getDts() == stAV::NOPTS_VALUE
- && (int64_t )myFrame.Frame->opaque != stAV::NOPTS_VALUE) {
- myFramePts = double((int64_t )myFrame.Frame->opaque);
- #else
- if(aPacket->getDts() == stAV::NOPTS_VALUE
- && myFrame.Frame->opaque != NULL
- && *(int64_t* )myFrame.Frame->opaque != stAV::NOPTS_VALUE) {
- myFramePts = double(*(int64_t* )myFrame.Frame->opaque);
- #endif
- } else if(aPacket->getDts() != stAV::NOPTS_VALUE) {
+ myFramePts = 0.0;
+ if(aPacket->getDts() != stAV::NOPTS_VALUE) {
 myFramePts = double(aPacket->getDts());
 } else {
- myFramePts = 0.0;
+ int64_t aPktPtsSync = stAV::NOPTS_VALUE;
+ #ifdef ST_USE64PTR
+ aPktPtsSync = (int64_t )myFrame.Frame->opaque;
+ #else
+ AVFrameSideData* aSideDataSync = av_frame_get_side_data(myFrame.Frame, (AVFrameSideDataType )1000);
+ if(aSideDataSync != NULL) {
+ memcpy(&aPktPtsSync, &aSideDataSync->data, sizeof(myVideoPktPts));
+ }
+ #endif
+ if(aPktPtsSync != stAV::NOPTS_VALUE) {
+ myFramePts = double(aPktPtsSync);
+ }
 }
 myFramePts *= av_q2d(myStream->time_base);
 myFramePts -= myPtsStartBase; // normalize PTS
@@ -722,6 +819,11 @@
 }
 }
 
+ // copy frame back from GPU to CPU memory
+ if(!myHWAccelCtx.isNull()) {
+ myHWAccelCtx->retrieveFrame(*this, myFrame.Frame);
+ }
+
 // we currently allow to override source format stored in metadata
 #ifdef ST_AV_NEWSTEREO
 AVFrameSideData* aSideData = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_STEREO3D);
@@ -820,7 +922,7 @@
 // simple one-stream case
 if(aSrcFormat == StFormat_FrameSequence) {
 if(isOddNumber(myFramesCounter)) {
- myCachedFrame.fill(myDataAdp);
+ myCachedFrame.fill(myDataAdp, false);
 } else {
 pushFrame(myCachedFrame, myDataAdp, aPacket->getSource(), StFormat_FrameSequence, aCubemapFormat, myFramePts);
 }
@@ -830,6 +932,7 @@
 }
 }
 
+ myFrame.reset();
 aPacket.nullify(); // and now packet finished
 }
 }

sview-15_10.tar.gz/StMoviePlayer/StVideo/StVideoQueue.h -> sview-15_11.tar.gz/StMoviePlayer/StVideo/StVideoQueue.h Changed

@@ -22,12 +22,59 @@
 #include <StGLStereo/StGLTextureQueue.h>
 
 #include "StAVPacketQueue.h"
-#include <StAV/StAVFrame.h>
+#include <StAV/StAVImage.h>
 
 // forward declarations
 class StVideoQueue;
 class StThread;
 
+/**
+ * Interface defining HWAccel context.
+ */
+class StHWAccelContext {
+
+ public:
+
+ /**
+ * Initialize the context.
+ */
+ virtual bool create(StVideoQueue& theVideo) = 0;
+
+ /**
+ * Destructor.
+ */
+ virtual ~StHWAccelContext() {}
+
+ /**
+ * Return true if context has been successfully initialized.
+ */
+ virtual bool isValid() const = 0;
+
+ /**
+ * Create decoder.
+ */
+ virtual bool decoderCreate(StVideoQueue& theVideo,
+ AVCodecContext* theCodecCtx) = 0;
+
+ /**
+ * Release decoder.
+ */
+ virtual void decoderDestroy() = 0;
+
+ /**
+ * AVFrame initialization callback.
+ */
+ virtual int getFrameBuffer(StVideoQueue& theVideo,
+ AVFrame* theFrame) = 0;
+
+ /**
+ * Fetch decoded results into specified frame.
+ */
+ virtual bool retrieveFrame(StVideoQueue& theVideo,
+ AVFrame* theFrame) = 0;
+
+};
+
 // define StHandle template specialization
 ST_DEFINE_HANDLE(StVideoQueue, StAVPacketQueue);
 
@@ -44,6 +91,14 @@
 
 public:
 
+ AVCodecID CodecIdH264;
+ AVCodecID CodecIdHEVC;
+ AVCodecID CodecIdMPEG2;
+ AVCodecID CodecIdWMV3;
+ AVCodecID CodecIdVC1;
+
+ public:
+
 /**
 * @return true if GPU usage is enabled
 */
@@ -52,10 +107,19 @@
 }
 
 /**
+ * Return true if GPU usage has been requested but failed (e.g. decoder should be reinitialized).
+ */
+ ST_LOCAL bool isGpuFailed() const {
+ return myIsGpuFailed;
+ }
+
+ /**
 * Setup GPU usage. Requires re-initialization to take effect!
 */
- ST_LOCAL void setUseGpu(const bool theToUseGpu) {
- myUseGpu = theToUseGpu;
+ ST_LOCAL void setUseGpu(const bool theToUseGpu,
+ const bool theIsGpuFailed = false) {
+ myUseGpu = theToUseGpu;
+ myIsGpuFailed = theIsGpuFailed;
 }
 
 ST_LOCAL bool isInDowntime() {
@@ -79,10 +143,6 @@
 myHasDataState.reset();
 }
 
- ST_LOCAL int64_t getVideoPktPts() const {
- return myVideoPktPts;
- }
-
 ST_LOCAL void setAClock(const double thePts) {
 myAudioClockMutex.lock();
 myAudioClock = thePts;
@@ -212,9 +272,58 @@
 private:
 
 /**
+ * Select frame format from the list.
+ */
+ ST_LOCAL static AVPixelFormat stGetFrameFormat(AVCodecContext* theCodecCtx,
+ const AVPixelFormat* theFormats) {
+ StVideoQueue* aVideoQueue = (StVideoQueue* )theCodecCtx->opaque;
+ return aVideoQueue->getFrameFormat(theFormats);
+ }
+
+ /**
+ * Frame buffer allocation callback (deprecated form).
+ */
+ ST_LOCAL static int stGetFrameBuffer1(AVCodecContext* theCodecCtx,
+ AVFrame* theFrame) {
+ StVideoQueue* aVideoQueue = (StVideoQueue* )theCodecCtx->opaque;
+ return aVideoQueue->getFrameBuffer(theFrame, 0);
+ }
+
+ /**
+ * Frame buffer allocation callback (wrapper).
+ */
+ ST_LOCAL static int stGetFrameBuffer2(AVCodecContext* theCodecCtx,
+ AVFrame* theFrame,
+ int theFlags) {
+ StVideoQueue* aVideoQueue = (StVideoQueue* )theCodecCtx->opaque;
+ return aVideoQueue->getFrameBuffer(theFrame, theFlags);
+ }
+
+ private:
+
+ /**
 * Initialize codec context.
 */
- ST_LOCAL bool initCodec(AVCodec* theCodec);
+ ST_LOCAL bool initCodec(AVCodec* theCodec,
+ const bool theToUseGpu);
+
+ /**
+ * Select frame format from the list.
+ */
+ ST_LOCAL AVPixelFormat getFrameFormat(const AVPixelFormat* theFormats);
+
+ /**
+ * Frame buffer allocation callback.
+ */
+ ST_LOCAL int getFrameBuffer(AVFrame* theFrame,
+ int theFlags);
+
+ /**
+ * Initialize hardware accelerated decoder.
+ */
+ ST_LOCAL bool hwaccelInit();
+
+private:
 
 /**
 * Initialize adapter over AVframe or perform to RGB conversion.
@@ -238,14 +347,12 @@
 StHandle<StVideoQueue> myMaster; //!< handle to Master decoding thread
 StHandle<StVideoQueue> mySlave; //!< handle to Slave decoding thread
 
-#if defined(_WIN32)
- AVCodec* myCodecDxva264; //!< DXVA2 codec (decoding on GPU in Windows)
- AVCodec* myCodecDxvaWmv; //!< DXVA2 codec (decoding on GPU in Windows)
- AVCodec* myCodecDxvaVc1; //!< DXVA2 codec (decoding on GPU in Windows)
-#elif defined(__APPLE__)
+ StHandle<StHWAccelContext> myHWAccelCtx;
+#if defined(__APPLE__)
 AVCodec* myCodecVda; //!< VDA codec (decoding on GPU in OS X)
 #endif
 bool myUseGpu; //!< activate decoding on GPU when possible
+ bool myIsGpuFailed; //!< flag indicating that GPU decoder can not handle input data
 
 StAVFrame myFrameRGB; //!< frame, converted to RGB (soft)
 StImagePlane myDataRGB; //!< RGB buffer data (for swscale)
@@ -254,6 +361,7 @@
 bool myToRgbIsBroken; //!< indicates broke swscale context - to RGB conversion is impossible
 
 StAVFrame myFrame; //!< original decoded video frame
+ StHandle<StAVFrameCounter> myFrameBufRef;
 StImage myDataAdp; //!< buffer data adaptor
 AVDiscard myAvDiscard; //!< discard parameter (to skip or not frames)

sview-15_10.tar.gz/StMoviePlayer/lang/chinese/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/chinese/StMoviePlayer.lng Changed

@@ -1,246 +1,246 @@
 # Chinese translation file for StMoviePlayer program
 # @author YSC
 --------
-1002="切换 左/右"
-1003="还原切换 左/右"
-1004="立体格式:"
-1015="打开另一视频"
-1020="播放/暂停"
-1021="显示/隐藏\n播放列表"
-1022="播放上一文件"
-1023="播放下一文件"
-1029="切换\n全屏/窗口模式"
-1100="文件"
-1101="打开视频->>"
-1102="保存快照->>"
-1103="立体格式->>"
-1170="文件信息"
-1104="音频设备->>"
-1105="随机播放"
-1106="近期播放记录->>"
-1107="通过GPU视频解码"
-1108="界面设计->>"
-1109="退出"
-1110="单一立体文件"
-1111="左右分离视频文件"
-1130="自动识别"
-1131="单画面"
-1132="左|右(右|左)"
-1133="平行配对"
-1134="上/下(右/左)"
-1135="上/下(左/右)"
-1136="交错"
-1137="立体红/青"
-1138="立体绿/红+蓝"
-1139="立体黄/蓝"
-1140="帧连续"
-1141="2x720p 平铺于 1080p"
-1142="2 视频流"
-1160="清除播放历史"
-1180="关闭"
-1181="应用一次"
-1182="每次应用"
-1185="显示错误"
-?1186="界面设计can not be started on {0} port!"
-1200="视频"
-1201="立体输出->>"
-1202="全屏"
-1203="重置"
-1204="切换左/右"
-1205="显示比例->>"
-1206="平滑过滤->>"
-1207="图像校正->>"
-1208="表面处理->>"
-1210="立体"
-1211="左画面"
-1212="右画面"
-1213="平行配对"
-1214="对眼"
-1250="源格式"
-1251="重启维持"
-?1252="Heal anamorphic 1080p/720p"
-1260="接近"
-1261="线性"
-1262="混纺交织"
-1270="重置默认"
-1271="亮度"
-1272="饱和度"
-1273="伽马"
-1280="平面"
-1281="球面"
-1282="圆筒"
-?1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1300="音频"
-1301="无"
-1302="音/视频 延迟"
-1303="从文件加载"
-1320="音/视频 同步"
-1321="音频提前于视频输入正值，否则负值。"
-1322="音频延迟:"
-1323="秒(s)"
-1350="字幕"
-1351="无"
-1353="从文件加载"
-1354="字体大小"
-1355="视差"
-1356="文本解析"
-?1357="Placement"
-?1358="Top"
-?1359="Bottom"
-?1360="Plain text"
-?1361="Lite HTML"
-1400="改变设备->>"
-1401="关于插件…"
-1402="FPS控制->>"
-1420="同时"
-1421="显示表"
-1422="减少CPU的使用"
-1500="帮助"
-1501="关于..."
-1502="检查更新->>"
-1503="许可证文本"
-1504="语言 (Language)"
-1505="阻止休眠->>"
-1506="用户提示"
-1507="实验特性"
-1508="关于系统"
-1509="界面尺寸->>"
-?1510="Hotkeys"
-?1511="Settings"
-1520="现在"
-1521="每天"
-1522="每周"
-1523="每年"
-1524="绝不"
-1550="绝不"
-1551="总是"
-1552="回放期间"
-1553="全屏时"
-1590="小"
-1591="正常"
-1592="大"
-1593="强制高解析 2X"
-2000="选择视频文件打开"
-2001="选择左视频文件打开"
-2002="选择右视频文件打开"
-2003="文件信息"
-2004="文件信息未获得"
-2005="文件删除"
-2006="确定完全移除吗?"
-2007="激活解码器:"
-2010="选择保存快照位置"
-2011="什么也没有保存!"
-2012="快照不为空!"
-?2013="Assign new Hot Key for action\n{0}"
-?2014="Conflicts with: {0}"
-3000="sView - Movie Player"
-3001="版本"
-?3002="Movie player allows you to play stereoscopic video.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0"
-?3003="A new version of sView is available on the official site www.sview.ru.\nPlease update your program."
-3004="系统信息"
-4000="关闭"
-4001="取消"
-4005="重置"
-4006="保存"
-4007="删除"
-?4008="Default"
-?4009="Defaults"
-?4010="Assign"
-5000="[左]"
-5001="[右]"
-5002="文件名字(s)"
-5003="视频大小"
-5004="装载时间"
-5005="ms"
-5006="像素比率"
-5007="像素格式"
-5008="（不存储在元数据）"
-5009="（不匹配的元数据）"
-5010="持续时间"
-5011="（不存储在元数据中，\n但检测到文件名称）"
-5300="标题"
-5301="作曲家"
-5302="艺术家"
-5303="专辑"
-5304="相册"
-5305="盘"
-5306="NB 盘"
-5307="流派"
-5308="评论"
-5309="注释"
-5310="描述"
-5311="出版商"
-5312="版权"
-5313="编码器"
-5314="工程师"
-5315="源"
-5316="创建时间"
-5317="数据"
-5318="年"
-5319="语言"
-5320="跟踪"
-5321="NB 轨道"
-5322="音轨增益"
-5323="轨道峰"
-5324="专辑增益"
-5325="专辑峰"
-6000="退出"
-6001="切换\n全屏/窗口模式"
-6002="显示 FPS"
-6003="立体格式: 自动侦测"
-6004="立体格式: 单画面"
-6005="立体格式: 上/下"
-6006="立体格式: 对眼"
-?6007="Show file info"
-?6008="Playlist - Go to the first item"
-?6009="Playlist - Go to the last item"
-6010="播放上一文件"
-6011="播放下一文件"
-6012="播放上一文件 [2]"
-6013="播放下一文件 [2]"
-6014="播放/暂停"
-?6015="Stop playback"
-?6016="Seek 5 seconds backward"
-?6017="Seek 5 seconds forward"
-6018="打开视频"
-6019="保存快照"
-?6020="Delete the file from file system"
-?6021="Mute/unmute audio"
-?6022="Audio volume down"
-?6023="Audio volume up"
-?6024="Previous audio track"
-?6025="Next audio track"
-?6026="Next subtitles track"
-?6027="Next subtitles track"
-?6028="Copy displayed subtitles text"
-?6029="Open URL from clipboard"
-6030="显示/隐藏播放列表"
-?6031="Reset image adjustment"
-?6032="Reset image position"
-6033="切换 左/右"
-?6034="Gamma correction - decrease"
-?6035="Gamma correction - increase"
-?6036="DX separation - decrease"
-?6037="DX separation - increase"
-?6038="DY separation - decrease"
-?6039="DY separation - increase"
-?6040="Angular separation - decrease"
-?6041="Angular separation - increase"
-?6042="Rotate 90 degrees counterclockwise"
-?6043="Rotate 90 degrees clockwise"
-?6044="Rotate counterclockwise"
-?6045="Rotate clockwise"
-?6046="Enable/disable panorama mode"
-?6047="Panning - navigate to the left"
-?6048="Panning - navigate to the right"
-?6049="Panning - navigate to the top"
-?6050="Panning - navigate to the bottom"
-/6051="Scale - increment"
-?6052="Scale - decrement"
-?6053="Y Rotation - left"
-?6054="Y Rotation - right"
-?6055="X Rotation - up"
-?6056="X Rotation - down"
-?6057="Enable/disable panorama mode"
+1002=切换 左/右
+1003=还原切换 左/右
+1004=立体格式:
+1015=打开另一视频
+1020=播放/暂停
+1021=显示/隐藏\n播放列表
+1022=播放上一文件
+1023=播放下一文件
+1029=切换\n全屏/窗口模式
+1100=文件
+1101=打开视频
+1102=保存快照
+1103=立体格式
+1170=文件信息
+1104=音频设备
+1105=随机播放
+1106=近期播放记录
+1107=通过GPU视频解码
+1108=界面设计
+1109=退出
+1110=单一立体文件
+1111=左右分离视频文件
+1130=自动识别
+1131=单画面
+1132=左|右(右|左)
+1133=平行配对
+1134=上/下(右/左)
+1135=上/下(左/右)
+1136=交错
+1137=立体红/青
+1138=立体绿/红+蓝
+1139=立体黄/蓝
+1140=帧连续
+1141=2x720p 平铺于 1080p
+1142=2 视频流
+1160=清除播放历史
+1180=关闭
+1181=应用一次
+1182=每次应用
+1185=显示错误
+?1186=界面设计can not be started on {0} port!
+1200=视频
+1201=立体输出
+1202=全屏
+1203=重置
+1204=切换左/右
+1205=显示比例
+1206=平滑过滤
+1207=图像校正
+1208=表面处理
+1210=立体
+1211=左画面
+1212=右画面
+1213=平行配对
+1214=对眼
+1250=源格式
+1251=重启维持
+?1252=Heal anamorphic 1080p/720p
+1260=接近
+1261=线性
+1262=混纺交织
+1270=重置默认
+1271=亮度
+1272=饱和度
+1273=伽马
+1280=平面
+1281=球面
+1282=圆筒
+?1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1300=音频
+1301=无
+1302=音/视频 延迟
+1303=从文件加载
+1320=音/视频 同步
+1321=音频提前于视频输入正值，否则负值。
+1322=音频延迟:
+1323=秒(s)
+1350=字幕
+1351=无
+1353=从文件加载
+1354=字体大小
+1355=视差
+1356=文本解析
+?1357=Placement
+?1358=Top
+?1359=Bottom
+?1360=Plain text
+?1361=Lite HTML
+1400=改变设备
+1401=关于插件…
+1402=FPS控制
+1420=同时
+1421=显示表
+1422=减少CPU的使用
+1500=帮助
+1501=关于...
+1502=检查更新
+1503=许可证文本
+1504=语言 (Language)
+1505=阻止休眠
+1506=用户提示
+1507=实验特性
+1508=关于系统
+1509=界面尺寸
+?1510=Hotkeys
+?1511=Settings
+1520=现在
+1521=每天
+1522=每周
+1523=每年
+1524=绝不
+1550=绝不
+1551=总是
+1552=回放期间
+1553=全屏时
+1590=小
+1591=正常
+1592=大
+1593=强制高解析 2X
+2000=选择视频文件打开
+2001=选择左视频文件打开
+2002=选择右视频文件打开
+2003=文件信息
+2004=文件信息未获得
+2005=文件删除
+2006=确定完全移除吗?
+2007=激活解码器:
+2010=选择保存快照位置
+2011=什么也没有保存!
+2012=快照不为空!
+?2013=Assign new Hot Key for action\n{0}
+?2014=Conflicts with: {0}
+3000=sView - Movie Player
+3001=版本
+?3002=Movie player allows you to play stereoscopic video.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0
+?3003=A new version of sView is available on the official site www.sview.ru.\nPlease update your program.
+3004=系统信息
+4000=关闭
+4001=取消
+4005=重置
+4006=保存
+4007=删除
+?4008=Default
+?4009=Defaults
+?4010=Assign
+5000=[左]
+5001=[右]
+5002=文件名字(s)
+5003=视频大小
+5004=装载时间
+5005=ms
+5006=像素比率
+5007=像素格式
+5008=（不存储在元数据）
+5009=（不匹配的元数据）
+5010=持续时间
+5011=（不存储在元数据中，\n但检测到文件名称）
+5300=标题
+5301=作曲家
+5302=艺术家
+5303=专辑
+5304=相册
+5305=盘
+5306=NB 盘
+5307=流派
+5308=评论
+5309=注释
+5310=描述
+5311=出版商
+5312=版权
+5313=编码器
+5314=工程师
+5315=源
+5316=创建时间
+5317=数据
+5318=年
+5319=语言
+5320=跟踪
+5321=NB 轨道
+5322=音轨增益
+5323=轨道峰
+5324=专辑增益
+5325=专辑峰
+6000=退出
+6001=切换\n全屏/窗口模式
+6002=显示 FPS
+6003=立体格式: 自动侦测
+6004=立体格式: 单画面
+6005=立体格式: 上/下
+6006=立体格式: 对眼
+?6007=Show file info
+?6008=Playlist - Go to the first item
+?6009=Playlist - Go to the last item
+6010=播放上一文件
+6011=播放下一文件
+6012=播放上一文件 [2]
+6013=播放下一文件 [2]
+6014=播放/暂停
+?6015=Stop playback
+?6016=Seek 5 seconds backward
+?6017=Seek 5 seconds forward
+6018=打开视频
+6019=保存快照
+?6020=Delete the file from file system
+?6021=Mute/unmute audio
+?6022=Audio volume down
+?6023=Audio volume up
+?6024=Previous audio track
+?6025=Next audio track
+?6026=Previous subtitles track
+?6027=Next subtitles track
+?6028=Copy displayed subtitles text
+?6029=Open URL from clipboard
+6030=显示/隐藏播放列表
+?6031=Reset image adjustment
+?6032=Reset image position
+6033=切换 左/右
+?6034=Gamma correction - decrease
+?6035=Gamma correction - increase
+?6036=DX separation - decrease
+?6037=DX separation - increase
+?6038=DY separation - decrease
+?6039=DY separation - increase
+?6040=Angular separation - decrease
+?6041=Angular separation - increase
+?6042=Rotate 90 degrees counterclockwise
+?6043=Rotate 90 degrees clockwise
+?6044=Rotate counterclockwise
+?6045=Rotate clockwise
+?6046=Enable/disable panorama mode
+?6047=Panning - navigate to the left
+?6048=Panning - navigate to the right
+?6049=Panning - navigate to the top
+?6050=Panning - navigate to the bottom
+/6051=Scale - increment
+?6052=Scale - decrement
+?6053=Y Rotation - left
+?6054=Y Rotation - right
+?6055=X Rotation - up
+?6056=X Rotation - down
+?6057=Enable/disable panorama mode

sview-15_10.tar.gz/StMoviePlayer/lang/czech/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/czech/StMoviePlayer.lng Changed

sview-15_10.tar.gz/StMoviePlayer/lang/english/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/english/StMoviePlayer.lng Changed

@@ -1,246 +1,246 @@
 # English translation file for StMoviePlayer program
 # @author Kirill Gavrilov
 --------
-1002="Swap Left/Right"
-1003="UnSwap Left/Right"
-1004="Stereoscopic format:"
-1015="Open another movie"
-1020="Play/Pause"
-1021="Show/Hide playlist"
-1022="Play Previous File"
-1023="Play Next File"
-1029="Switch\nfullscreen/windowed"
-1100="Media"
-1101="Open Movie..."
-1102="Save Snapshot..."
-1103="Stereoscopic format"
-1170="File info"
-1104="Audio Device"
-1105="Shuffle"
-1106="Recent files"
-1107="Video decoding on GPU"
-1108="Web UI"
-1109="Quit"
-1110="From One file"
-1111="Left+Right files"
-1130="Source"
-1131="Mono"
-1132="Cross-eyed"
-1133="Parallel Pair"
-1134="Over/Under (R/L)"
-1135="Over/Under (L/R)"
-1136="Interlaced"
-1137="Anaglyph Red/Cyan"
-1138="Anaglyph Green/Red+Blue"
-1139="Anaglyph Yellow/Blue"
-1140="Frame-sequential"
-1141="2x720p in 1080p tiled"
-1142="2 Streams"
-1160="Clear history"
-1180="Turn Off"
-1181="Launch once"
-1182="Launch every time"
-1185="Show errors"
-1186="Web UI can not be started on {0} port!"
-1200="View"
-1201="Stereo Output"
-1202="Fullscreen"
-1203="Reset"
-1204="Swap Left/Right"
-1205="Display Ratio"
-1206="Smooth Filter"
-1207="Image Adjust"
-1208="Panorama"
-1210="Stereo"
-1211="Left View"
-1212="Right View"
-1213="Parallel Pair"
-1214="Cross-eyed"
-1250="Source"
-1251="Keep on restart"
-1252="Heal anamorphic 1080p/720p"
-1260="Nearest"
-1261="Linear"
-1262="Blend Deinterlace"
-1270="Reset to defaults"
-1271="Brightness"
-1272="Saturation"
-1273="Gamma"
-1280="Plane"
-1281="Sphere"
-1282="Cylinder"
-1283="Cubemap"
-1285="Track orientation"
-1286="Track orientation (poor)"
-1300="Audio"
-1301="None"
-1302="Audio/Video delay"
-1303="Attach from file"
-1320="Audio/Video synchronization"
-1321="Enter positive value if audio appears earlier than video and negative otherwise."
-1322="Audio delay:"
-1323="second(s)"
-1350="Subtitles"
-1351="None"
-1353="Attach from file"
-1354="Font Size"
-1355="Parallax"
-1356="Text parser"
-1357="Placement"
-1358="Top"
-1359="Bottom"
-1360="Plain text"
-1361="Lite HTML"
-1400="Change device"
-1401="About Plugin..."
-1402="FPS Control"
-1420="VSync"
-1421="Show Meter"
-1422="Reduce CPU usage"
-1500="Help"
-1501="About..."
-1502="Check for updates"
-1503="License text"
-1504="Language"
-1505="Block sleeping"
-1506="User tips"
-1507="Experimental features"
-1508="About system"
-1509="Interface Scale"
-1510="Hotkeys"
-1511="Settings"
-1520="Now"
-1521="Each day"
-1522="Each week"
-1523="Each year"
-1524="Never"
-1550="Never"
-1551="Always"
-1552="During Playback"
-1553="When in Full-screen"
-1590="Small"
-1591="Normal"
-1592="Big"
-1593="Force HiDPI 2X"
-2000="Choose the video file to open"
-2001="Choose LEFT video file to open"
-2002="Choose RIGHT video file to open"
-2003="File Info"
-2004="File information is unavailable"
-2005="File deletion"
-2006="Do you really want to completely remove this file?"
-2007="Active decoders:"
-2010="Choose location to save snapshot"
-2011="Nothing to save!"
-2012="Snapshot not available!"
-2013="Assign new Hot Key for action\n{0}"
-2014="Conflicts with: {0}"
-3000="sView - Movie Player"
-3001="version"
-3002="Movie player allows you to play stereoscopic video.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0"
-3003="A new version of sView is available on the official site www.sview.ru.\nPlease update your program."
-3004="System Info"
-4000="Close"
-4001="Cancel"
-4005="Reset"
-4006="Save"
-4007="Delete"
-4008="Default"
-4009="Defaults"
-4010="Assign"
-5000="[left]"
-5001="[right]"
-5002="File name(s)"
-5003="Video dimensions"
-5004="Load time"
-5005="ms"
-5006="Pixel ratio"
-5007="Pixel format"
-5008="(does not stored in metadata)"
-5009="(does not match metadata)"
-5010="Duration"
-5011="(does not stored in metadata,\nbut detected from file name)"
-5300="Title"
-5301="Composer"
-5302="Artist"
-5303="Album artist"
-5304="Album"
-5305="Disc"
-5306="Nb. of discs"
-5307="Genre"
-5308="Comment"
-5309="Notes"
-5310="Description"
-5311="Publisher"
-5312="Copyright"
-5313="Encoder"
-5314="Engineer"
-5315="Source"
-5316="Creation time"
-5317="Date"
-5318="Year"
-5319="Language"
-5320="Track"
-5321="Nb. of tracks"
-5322="Track gain"
-5323="Track peak"
-5324="Album gain"
-5325="Album peak"
-6000="Quit program"
-6001="Switch fullscreen/windowed"
-6002="Show/hide FPS meter"
-6003="Stereo format - Auto"
-6004="Stereo format - Mono"
-6005="Stereo format - Over/Under"
-6006="Stereo format - Side by side"
-6007="Show file info"
-6008="Playlist - Go to the first item"
-6009="Playlist - Go to the last item"
-6010="Playlist - Go to the previous item"
-6011="Playlist - Go to the next item"
-6012="Playlist - Go to the previous item [2]"
-6013="Playlist - Go to the next item [2]"
-6014="Play/pause playback"
-6015="Stop playback"
-6016="Seek 5 seconds backward"
-6017="Seek 5 seconds forward"
-6018="Show open file dialog"
-6019="Save snapshot"
-6020="Delete the file from file system"
-6021="Mute/unmute audio"
-6022="Audio volume down"
-6023="Audio volume up"
-6024="Previous audio track"
-6025="Next audio track"
-6026="Next subtitles track"
-6027="Next subtitles track"
-6028="Copy displayed subtitles text"
-6029="Open URL from clipboard"
-6030="Show/hide playlist"
-6031="Reset image adjustment"
-6032="Reset image position"
-6033="Swap Left/Right"
-6034="Gamma correction - decrease"
-6035="Gamma correction - increase"
-6036="DX separation - decrease"
-6037="DX separation - increase"
-6038="DY separation - decrease"
-6039="DY separation - increase"
-6040="Angular separation - decrease"
-6041="Angular separation - increase"
-6042="Rotate 90 degrees counterclockwise"
-6043="Rotate 90 degrees clockwise"
-6044="Rotate counterclockwise"
-6045="Rotate clockwise"
-6046="Enable/disable panorama mode"
-6047="Panning - navigate to the left"
-6048="Panning - navigate to the right"
-6049="Panning - navigate to the top"
-6050="Panning - navigate to the bottom"
-6051="Scale - increment"
-6052="Scale - decrement"
-6053="Y Rotation - left"
-6054="Y Rotation - right"
-6055="X Rotation - up"
-6056="X Rotation - down"
-6057="Enable/disable panorama mode"
+1002=Swap Left/Right
+1003=UnSwap Left/Right
+1004=Stereoscopic format:
+1015=Open another movie
+1020=Play/Pause
+1021=Show/Hide playlist
+1022=Play Previous File
+1023=Play Next File
+1029=Switch\nfullscreen/windowed
+1100=Media
+1101=Open Movie...
+1102=Save Snapshot...
+1103=Stereoscopic format
+1170=File info
+1104=Audio Device
+1105=Shuffle
+1106=Recent files
+1107=Video decoding on GPU
+1108=Web UI
+1109=Quit
+1110=From One file
+1111=Left+Right files
+1130=Source
+1131=Mono
+1132=Cross-eyed
+1133=Parallel Pair
+1134=Over/Under (R/L)
+1135=Over/Under (L/R)
+1136=Interlaced
+1137=Anaglyph Red/Cyan
+1138=Anaglyph Green/Red+Blue
+1139=Anaglyph Yellow/Blue
+1140=Frame-sequential
+1141=2x720p in 1080p tiled
+1142=2 Streams
+1160=Clear history
+1180=Turn Off
+1181=Launch once
+1182=Launch every time
+1185=Show errors
+1186=Web UI can not be started on {0} port!
+1200=View
+1201=Stereo Output
+1202=Fullscreen
+1203=Reset
+1204=Swap Left/Right
+1205=Display Ratio
+1206=Smooth Filter
+1207=Image Adjust
+1208=Panorama
+1210=Stereo
+1211=Left View
+1212=Right View
+1213=Parallel Pair
+1214=Cross-eyed
+1250=Source
+1251=Keep on restart
+1252=Heal anamorphic 1080p/720p
+1260=Nearest
+1261=Linear
+1262=Blend Deinterlace
+1270=Reset to defaults
+1271=Brightness
+1272=Saturation
+1273=Gamma
+1280=Plane
+1281=Sphere
+1282=Cylinder
+1283=Cubemap
+1285=Track orientation
+1286=Track orientation (poor)
+1300=Audio
+1301=None
+1302=Audio/Video delay
+1303=Attach from file
+1320=Audio/Video synchronization
+1321=Enter positive value if audio appears earlier than video and negative otherwise.
+1322=Audio delay:
+1323=second(s)
+1350=Subtitles
+1351=None
+1353=Attach from file
+1354=Font Size
+1355=Parallax
+1356=Text parser
+1357=Placement
+1358=Top
+1359=Bottom
+1360=Plain text
+1361=Lite HTML
+1400=Change device
+1401=About Plugin...
+1402=FPS Control
+1420=VSync
+1421=Show Meter
+1422=Reduce CPU usage
+1500=Help
+1501=About...
+1502=Check for updates
+1503=License text
+1504=Language
+1505=Block sleeping
+1506=User tips
+1507=Experimental features
+1508=About system
+1509=Interface Scale
+1510=Hotkeys
+1511=Settings
+1520=Now
+1521=Each day
+1522=Each week
+1523=Each year
+1524=Never
+1550=Never
+1551=Always
+1552=During Playback
+1553=When in Full-screen
+1590=Small
+1591=Normal
+1592=Big
+1593=Force HiDPI 2X
+2000=Choose the video file to open
+2001=Choose LEFT video file to open
+2002=Choose RIGHT video file to open
+2003=File Info
+2004=File information is unavailable
+2005=File deletion
+2006=Do you really want to completely remove this file?
+2007=Active decoders:
+2010=Choose location to save snapshot
+2011=Nothing to save!
+2012=Snapshot not available!
+2013=Assign new Hot Key for action\n{0}
+2014=Conflicts with: {0}
+3000=sView - Movie Player
+3001=version
+3002=Movie player allows you to play stereoscopic video.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0
+3003=A new version of sView is available on the official site www.sview.ru.\nPlease update your program.
+3004=System Info
+4000=Close
+4001=Cancel
+4005=Reset
+4006=Save
+4007=Delete
+4008=Default
+4009=Defaults
+4010=Assign
+5000=[left]
+5001=[right]
+5002=File name(s)
+5003=Video dimensions
+5004=Load time
+5005=ms
+5006=Pixel ratio
+5007=Pixel format
+5008=(does not stored in metadata)
+5009=(does not match metadata)
+5010=Duration
+5011=(does not stored in metadata,\nbut detected from file name)
+5300=Title
+5301=Composer
+5302=Artist
+5303=Album artist
+5304=Album
+5305=Disc
+5306=Nb. of discs
+5307=Genre
+5308=Comment
+5309=Notes
+5310=Description
+5311=Publisher
+5312=Copyright
+5313=Encoder
+5314=Engineer
+5315=Source
+5316=Creation time
+5317=Date
+5318=Year
+5319=Language
+5320=Track
+5321=Nb. of tracks
+5322=Track gain
+5323=Track peak
+5324=Album gain
+5325=Album peak
+6000=Quit program
+6001=Switch fullscreen/windowed
+6002=Show/hide FPS meter
+6003=Stereo format - Auto
+6004=Stereo format - Mono
+6005=Stereo format - Over/Under
+6006=Stereo format - Side by side
+6007=Show file info
+6008=Playlist - Go to the first item
+6009=Playlist - Go to the last item
+6010=Playlist - Go to the previous item
+6011=Playlist - Go to the next item
+6012=Playlist - Go to the previous item [2]
+6013=Playlist - Go to the next item [2]
+6014=Play/pause playback
+6015=Stop playback
+6016=Seek 5 seconds backward
+6017=Seek 5 seconds forward
+6018=Show open file dialog
+6019=Save snapshot
+6020=Delete the file from file system
+6021=Mute/unmute audio
+6022=Audio volume down
+6023=Audio volume up
+6024=Previous audio track
+6025=Next audio track
+6026=Previous subtitles track
+6027=Next subtitles track
+6028=Copy displayed subtitles text
+6029=Open URL from clipboard
+6030=Show/hide playlist
+6031=Reset image adjustment
+6032=Reset image position
+6033=Swap Left/Right
+6034=Gamma correction - decrease
+6035=Gamma correction - increase
+6036=DX separation - decrease
+6037=DX separation - increase
+6038=DY separation - decrease
+6039=DY separation - increase
+6040=Angular separation - decrease
+6041=Angular separation - increase
+6042=Rotate 90 degrees counterclockwise
+6043=Rotate 90 degrees clockwise
+6044=Rotate counterclockwise
+6045=Rotate clockwise
+6046=Enable/disable panorama mode
+6047=Panning - navigate to the left
+6048=Panning - navigate to the right
+6049=Panning - navigate to the top
+6050=Panning - navigate to the bottom
+6051=Scale - increment
+6052=Scale - decrement
+6053=Y Rotation - left
+6054=Y Rotation - right
+6055=X Rotation - up
+6056=X Rotation - down
+6057=Enable/disable panorama mode

sview-15_10.tar.gz/StMoviePlayer/lang/french/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/french/StMoviePlayer.lng Changed

@@ -1,246 +1,246 @@
 # French translation file for StMoviePlayer program
 # @author gramoun for Kirill Gavrilov
 --------
-1002="Gauche/Droite inversé"
-1003="Gauche/Droite normal"
-1004="Format entrée:"
-1015="Ouvre autre vidéo"
-1020="Lecture/Pause"
-1021="Affiche/Masque playlist"
-1022="Fichier Précédent"
-1023="Fichier Suivant"
-1029="Bascule\Plein écran/fenêtre"
-1100="Média"
-1101="Ouvre Video..."
-1102="Enregistre Capture..."
-1103="Format Stéréo d'entrée"
-1170="File info"
-1104="Audio Device"
-1105="Aléatorie"
-1106="Médias récents"
-1107="Video decoding on GPU"
-1108="Web UI"
-1109="Quitter"
-1110="Depuis un fichier"
-1111="2 Fichiers Gauche+Droit"
-1130="Source"
-1131="Mono"
-1132="Cross-eyed"
-1133="Coté/Coté (SbS)"
-1134="Dessus/Dessous(D/G)"
-1135="Dessus/Dessous(G/D)"
-1136="Entrelacé"
-1137="Anaglyphe Rouge/Bleu"
-1138="Anaglyphe Vert/Magenta"
-1139="Anaglyphe Jaune/Bleu"
-1140="Frame-sequential"
-1141="2x720p in 1080p tiled"
-1142="2 Streams"
-1160="Effacer l'historique"
-1180="Arrêter"
-1181="Lancez une fois"
-1182="Lancer à chaque fois"
-1185="Afficher les erreurs"
-?1186="Web UI can not be started on {0} port!"
-1200="Affichage"
-1201="Sortie Stéréo"
-1202="Plein Ecran"
-1203="Réinitialisation"
-1204="Inverser Gauche/Droite"
-1205="Ratio d'affichage"
-1206="Lissage antialiasing"
-1207="Réglage de l'image"
-1208="Panorama"
-1210="Stéréo"
-1211="Vue Gauche"
-1212="Vue Droite"
-1213="Coté/Coté (SbS)"
-1214="Cross-eyed"
-1250="Source"
-1251="Garder après redémarrage"
-?1252="Heal anamorphic 1080p/720p"
-1260="Plus proche"
-1261="Lineaire"
-1262="Blend Deinterlace"
-1270="Rétablir par défaut"
-1271="Brightness"
-1272="Saturation"
-1273="Gamma"
-1280="Plan"
-1281="Sphère"
-1282="Cylindre"
-1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1300="Audio"
-1301="Aucun"
-1302="Audio/Video delay"
-1303="Attacher un fichier"
-1320="Audio/Video synchronization"
-?1321="Enter positive value if audio appears earlier than video and negative otherwise."
-1322="Audio delay:"
-1323="second(s)"
-1350="Subtitles"
-1351="Aucun"
-1353="Attacher un fichier"
-1354="Taille De Police"
-1355="Parallaxe"
-?1356="Text parser"
-1357="Placement"
-1358="En haut"
-1359="Au fond"
-?1360="Plain text"
-?1361="Lite HTML"
-1400="Changer la sortie"
-1401="A propos du Plugin..."
-1402="Contrôle de I/S"
-1420="Synchro Vert."
-1421="Voir I/S"
-1422="Réduire l'utilisation de CPU"
-1500="Aide"
-1501="A Propos..."
-1502="Vérifier nouvelle version"
-1503="Texte de la Licence"
-1504="Language"
-1505="Empêcher le sommeil"
-1506="Conseils d'utilisation"
-?1507="Experimental features"
-?1508="About system"
-?1509="Scale Interface"
-1510="Raccourcis"
-1511="Paramètres"
-1520="Maintenant"
-1521="Chaque Jour"
-1522="Chaque Mois"
-1523="Chaque Année"
-1524="Jamais"
-1550="Jamais"
-1551="Always"
-1552="During Playback"
-1553="When in Full-screen"
-1590="Petit"
-1591="Normal"
-1592="Gros"
-1593="Force HiDPI 2X"
-2000="Choix du fichier vidéo à ouvrir"
-2001="Choix du fichier vidéo Gauche à ouvrir"
-2002="Choix du fichier vidéo Droite à ouvrir"
-?2003="File Info"
-2004="L'information est indisponible"
-?2005="File deletion"
-?2006="Do you really want to completely remove this file?"
-?2007="Active decoders:"
-2010="Emplacement de la capture écran"
-2011="Rien à enregistrer!"
-2012="Capture non disponible!"
-2013="Changement raccourcu clavier pour\n{0}"
-?2014="Conflicts with: {0}"
-3000="sView - Movie Player"
-3001="version"
-3002="Movie Player vous permet d'ouvrir des vidéo stéréoscopiques.\n © {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}\n\nThis program is distributed under GPL3.0"
-3003="Une nouvelle version de sView est disponible sur le site officiel www.sview.ru.\nSVP, mettez votre programme à jour."
-3004="System Info"
-4000="Fermer"
-4001="Annuler"
-4005="Réinitialiser"
-4006="Enregistre"
-4007="Supprimer"
-?4008="Default"
-?4009="Defaults"
-4010="Affecter"
-5000="[gauche]"
-5001="[droite]"
-5002="Nom de fichier(s)"
-5003="Résolution vidéo"
-5004="Temps de démarrage"
-5005="ms"
-5006="Pixel ratio"
-5007="Pixel format"
-?5008="(does not stored in metadata)"
-?5009="(does not match metadata)"
-5010="Durée"
-?5011="(does not stored in metadata,\nbut detected from file name)"
-5300="Titre"
-5301="Compositeur"
-5302="Artiste"
-5303="Artiste de l'album"
-5304="Album"
-5305="Disque"
-5306="Nb. de disques"
-5307="Genre"
-5308="Commentaire"
-5309="Remarques"
-5310="Description"
-5311="Éditeur"
-5312="Copyright"
-5313="Encoder"
-5314="Ingénieur"
-5315="Source"
-5316="Temps de création"
-5317="Date"
-5318="Année"
-5319="Langue"
-5320="Track"
-5321="Nb. of tracks"
-5322="Track gain"
-5323="Track peak"
-5324="Album gain"
-5325="Album peak"
-6000="Quit program"
-6001="Bascule\Plein écran/fenêtre"
-6002="Voir I/S"
-6003="Format Stéréo d'entrée - Auto-détection"
-6004="Format Stéréo d'entrée - Mono"
-6005="Format Stéréo d'entrée - Dessus/Dessous"
-6006="Format Stéréo d'entrée - Coté/Coté (SbS)"
-6007="Afficher les informations sur le fichier"
-6008="Playlist - Aller au premier élément"
-6009="Playlist - Aller au dernier élément"
-6010="Playlist - Aller à l'élément précédent"
-6011="Playlist - Aller à l'élément suivant"
-6012="Playlist - Aller à l'élément précédent [2]"
-6013="Playlist - Aller à l'élément suivant [2]"
-6014="Lecture/Pause"
-?6015="Stop playback"
-?6016="Seek 5 seconds backward"
-?6017="Seek 5 seconds forward"
-6018="Ouvre autre vidéo"
-6019="Enregistrer snapshot"
-6020="Supprimer le fichier du système de fichiers"
-?6021="Mute/unmute audio"
-?6022="Audio volume down"
-?6023="Audio volume up"
-?6024="Previous audio track"
-?6025="Next audio track"
-?6026="Next subtitles track"
-?6027="Next subtitles track"
-?6028="Copy displayed subtitles text"
-?6029="Open URL from clipboard"
-6030="Affiche/Masque playlist"
-6031="Réinitialiser réglage de l'image"
-6032="Réinitialiser position de l'image"
-6033="Inverser Gauche/Droite"
-?6034="Gamma correction - decrease"
-?6035="Gamma correction - increase"
-?6036="DX separation - decrease"
-?6037="DX separation - increase"
-?6038="DY separation - decrease"
-?6039="DY separation - increase"
-?6040="Angular separation - decrease"
-?6041="Angular separation - increase"
-6042="Faire pivoter un objet de 90 degrés vers la gauche"
-6043="Faire pivoter un objet de 90 degrés vers la droite"
-6044="Sens inverse des aiguilles d’une montre"
-6045="Sens des aiguilles d’une montre"
-6046="Activer / désactiver le mode panorama"
-6047="Naviguer vers la gauche"
-6048="Naviguer vers la droite"
-6049="Naviguer vers le haut"
-6050="Naviguer vers le bas"
-6051="Zoom"
-6052="Dézoomer"
-?6053="Y Rotation - left"
-?6054="Y Rotation - right"
-?6055="X Rotation - up"
-?6056="X Rotation - down"
-6057="Activer / désactiver le mode panorama"
+1002=Gauche/Droite inversé
+1003=Gauche/Droite normal
+1004=Format entrée:
+1015=Ouvre autre vidéo
+1020=Lecture/Pause
+1021=Affiche/Masque playlist
+1022=Fichier Précédent
+1023=Fichier Suivant
+1029=Bascule\Plein écran/fenêtre
+1100=Média
+1101=Ouvre Video...
+1102=Enregistre Capture...
+1103=Format Stéréo d'entrée
+1170=File info
+1104=Audio Device
+1105=Aléatorie
+1106=Médias récents
+1107=Video decoding on GPU
+1108=Web UI
+1109=Quitter
+1110=Depuis un fichier
+1111=2 Fichiers Gauche+Droit
+1130=Source
+1131=Mono
+1132=Cross-eyed
+1133=Coté/Coté (SbS)
+1134=Dessus/Dessous(D/G)
+1135=Dessus/Dessous(G/D)
+1136=Entrelacé
+1137=Anaglyphe Rouge/Bleu
+1138=Anaglyphe Vert/Magenta
+1139=Anaglyphe Jaune/Bleu
+1140=Frame-sequential
+1141=2x720p in 1080p tiled
+1142=2 Streams
+1160=Effacer l'historique
+1180=Arrêter
+1181=Lancez une fois
+1182=Lancer à chaque fois
+1185=Afficher les erreurs
+?1186=Web UI can not be started on {0} port!
+1200=Affichage
+1201=Sortie Stéréo
+1202=Plein Ecran
+1203=Réinitialisation
+1204=Inverser Gauche/Droite
+1205=Ratio d'affichage
+1206=Lissage antialiasing
+1207=Réglage de l'image
+1208=Panorama
+1210=Stéréo
+1211=Vue Gauche
+1212=Vue Droite
+1213=Coté/Coté (SbS)
+1214=Cross-eyed
+1250=Source
+1251=Garder après redémarrage
+?1252=Heal anamorphic 1080p/720p
+1260=Plus proche
+1261=Lineaire
+1262=Blend Deinterlace
+1270=Rétablir par défaut
+1271=Brightness
+1272=Saturation
+1273=Gamma
+1280=Plan
+1281=Sphère
+1282=Cylindre
+1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1300=Audio
+1301=Aucun
+1302=Audio/Video delay
+1303=Attacher un fichier
+1320=Audio/Video synchronization
+?1321=Enter positive value if audio appears earlier than video and negative otherwise.
+1322=Audio delay:
+1323=second(s)
+1350=Subtitles
+1351=Aucun
+1353=Attacher un fichier
+1354=Taille De Police
+1355=Parallaxe
+?1356=Text parser
+1357=Placement
+1358=En haut
+1359=Au fond
+?1360=Plain text
+?1361=Lite HTML
+1400=Changer la sortie
+1401=A propos du Plugin...
+1402=Contrôle de I/S
+1420=Synchro Vert.
+1421=Voir I/S
+1422=Réduire l'utilisation de CPU
+1500=Aide
+1501=A Propos...
+1502=Vérifier nouvelle version
+1503=Texte de la Licence
+1504=Language
+1505=Empêcher le sommeil
+1506=Conseils d'utilisation
+?1507=Experimental features
+?1508=About system
+?1509=Scale Interface
+1510=Raccourcis
+1511=Paramètres
+1520=Maintenant
+1521=Chaque Jour
+1522=Chaque Mois
+1523=Chaque Année
+1524=Jamais
+1550=Jamais
+1551=Always
+1552=During Playback
+1553=When in Full-screen
+1590=Petit
+1591=Normal
+1592=Gros
+1593=Force HiDPI 2X
+2000=Choix du fichier vidéo à ouvrir
+2001=Choix du fichier vidéo Gauche à ouvrir
+2002=Choix du fichier vidéo Droite à ouvrir
+?2003=File Info
+2004=L'information est indisponible
+?2005=File deletion
+?2006=Do you really want to completely remove this file?
+?2007=Active decoders:
+2010=Emplacement de la capture écran
+2011=Rien à enregistrer!
+2012=Capture non disponible!
+2013=Changement raccourcu clavier pour\n{0}
+?2014=Conflicts with: {0}
+3000=sView - Movie Player
+3001=version
+3002=Movie Player vous permet d'ouvrir des vidéo stéréoscopiques.\n © {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}\n\nThis program is distributed under GPL3.0
+3003=Une nouvelle version de sView est disponible sur le site officiel www.sview.ru.\nSVP, mettez votre programme à jour.
+3004=System Info
+4000=Fermer
+4001=Annuler
+4005=Réinitialiser
+4006=Enregistre
+4007=Supprimer
+?4008=Default
+?4009=Defaults
+4010=Affecter
+5000=[gauche]
+5001=[droite]
+5002=Nom de fichier(s)
+5003=Résolution vidéo
+5004=Temps de démarrage
+5005=ms
+5006=Pixel ratio
+5007=Pixel format
+?5008=(does not stored in metadata)
+?5009=(does not match metadata)
+5010=Durée
+?5011=(does not stored in metadata,\nbut detected from file name)
+5300=Titre
+5301=Compositeur
+5302=Artiste
+5303=Artiste de l'album
+5304=Album
+5305=Disque
+5306=Nb. de disques
+5307=Genre
+5308=Commentaire
+5309=Remarques
+5310=Description
+5311=Éditeur
+5312=Copyright
+5313=Encoder
+5314=Ingénieur
+5315=Source
+5316=Temps de création
+5317=Date
+5318=Année
+5319=Langue
+5320=Track
+5321=Nb. of tracks
+5322=Track gain
+5323=Track peak
+5324=Album gain
+5325=Album peak
+6000=Quit program
+6001=Bascule\Plein écran/fenêtre
+6002=Voir I/S
+6003=Format Stéréo d'entrée - Auto-détection
+6004=Format Stéréo d'entrée - Mono
+6005=Format Stéréo d'entrée - Dessus/Dessous
+6006=Format Stéréo d'entrée - Coté/Coté (SbS)
+6007=Afficher les informations sur le fichier
+6008=Playlist - Aller au premier élément
+6009=Playlist - Aller au dernier élément
+6010=Playlist - Aller à l'élément précédent
+6011=Playlist - Aller à l'élément suivant
+6012=Playlist - Aller à l'élément précédent [2]
+6013=Playlist - Aller à l'élément suivant [2]
+6014=Lecture/Pause
+?6015=Stop playback
+?6016=Seek 5 seconds backward
+?6017=Seek 5 seconds forward
+6018=Ouvre autre vidéo
+6019=Enregistrer snapshot
+6020=Supprimer le fichier du système de fichiers
+?6021=Mute/unmute audio
+?6022=Audio volume down
+?6023=Audio volume up
+?6024=Previous audio track
+?6025=Next audio track
+?6026=Previous subtitles track
+?6027=Next subtitles track
+?6028=Copy displayed subtitles text
+?6029=Open URL from clipboard
+6030=Affiche/Masque playlist
+6031=Réinitialiser réglage de l'image
+6032=Réinitialiser position de l'image
+6033=Inverser Gauche/Droite
+?6034=Gamma correction - decrease
+?6035=Gamma correction - increase
+?6036=DX separation - decrease
+?6037=DX separation - increase
+?6038=DY separation - decrease
+?6039=DY separation - increase
+?6040=Angular separation - decrease
+?6041=Angular separation - increase
+6042=Faire pivoter un objet de 90 degrés vers la gauche
+6043=Faire pivoter un objet de 90 degrés vers la droite
+6044=Sens inverse des aiguilles d’une montre
+6045=Sens des aiguilles d’une montre
+6046=Activer / désactiver le mode panorama
+6047=Naviguer vers la gauche
+6048=Naviguer vers la droite
+6049=Naviguer vers le haut
+6050=Naviguer vers le bas
+6051=Zoom
+6052=Dézoomer
+?6053=Y Rotation - left
+?6054=Y Rotation - right
+?6055=X Rotation - up
+?6056=X Rotation - down
+6057=Activer / désactiver le mode panorama

sview-15_10.tar.gz/StMoviePlayer/lang/german/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/german/StMoviePlayer.lng Changed

@@ -1,246 +1,246 @@
 # German translation file for StMoviePlayer program
 # @author Kirill Gavrilov
 --------
-1002="L&R Vertauschen An"
-1003="L&R Vertauschen Aus"
-1004="Quellformat:"
-1015="Öffnen anderen Film"
-1020="Wiedergabe/Pause"
-1021="Anzeigen/ausblenden Wiedergabeliste"
-1022="Vorheriges Stück"
-1023="Nachfolgendes Stück"
-1029="Vollbildmodus/Fenstermodus"
-1100="Medien"
-1101="Film öffnen..."
-1102="Videoschnappschuss speichern..."
-1103="Quelle Stereo-Format"
-1170="Datei-Info"
-1104="Audiogerät"
-1105="Zufällig"
-1106="Zuletzt geöffnete Medien öffnen"
-1107="GPU-basierter Video-Dekodierung"
-1108="Web UI"
-1109="Beenden"
-1110="Einer Datei"
-1111="Zwei Dateien"
-1130="Quelle"
-1131="Mono"
-1132="Schielend"
-1133="Parallel Pair"
-1134="Over/Under (R/L)"
-1135="Over/Under (L/R)"
-1136="Interlaced"
-1137="Anaglyph Rot/Cyan"
-1138="Anaglyph Grün/Rot+Blau"
-1139="Anaglyph Gelb/Blau"
-1140="Rahmen-sequentielle"
-1141="2x720p in 1080p tiled"
-1142="2 Streams"
-1160="Verlauf löschen"
-1180="Ausschalten"
-1181="Starten einmal"
-1182="Starten jedesmal"
-1185="Fehler anzeigen"
-?1186="Web UI can not be started on {0} port!"
-1200="Ansicht"
-1201="Stereo-Ausgang"
-1202="Vollbild"
-1203="Zurückstellen"
-1204="L&R Vertauschen"
-1205="Seitenverhältnis"
-1206="Glatte Filter"
-1207="Bildeinstellung"
-1208="Panorama"
-1210="Stereo"
-1211="Linke Bild"
-1212="Rechte Bild"
-1213="Parallel Pair"
-1214="Cross-eyed"
-1250="Quelle"
-1251="Halten beim Neustart"
-?1252="Heal anamorphic 1080p/720p"
-1260="Nearest"
-1261="Linear"
-1262="Blend Deinterlace"
-1270="Auf Standardwerte zurücksetzen"
-1271="Helligkeit"
-1272="Sättigung"
-1273="Gamma"
-1280="Fläche"
-1281="Kugel"
-1282="Zylinder"
-1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-1300="Audio"
-1301="keiner"
-1302="Audio/Video Verzögerung"
-1303="Bringen aus der Datei"
-1320="Audio/Video Synchronisierung"
-1321="Enter positive value if audio appears earlier than video and negative otherwise."
-1322="Audioverzögerung:"
-1323="Sek."
-1350="Untertitel"
-1351="keiner"
-1353="Bringen aus der Datei"
-1354="Schriftgröße"
-1355="Parallax"
-1356="Text parser"
-1357="Platzierungen"
-1358="Top"
-1359="Boden"
-1360="Plain text"
-1361="Lite HTML"
-1400="Gerät ändern"
-1401="Über Plugin..."
-1402="FPS Kontrolle"
-1420="VSync"
-1421="Zeige Meter"
-1422="Reduce CPU usage"
-1500="Hilfe"
-1501="Über..."
-1502="Nach Updates suchen"
-1503="Lizenztext"
-1504="Language"
-1505="Blockieren Schlaf"
-1506="Anwendertipps"
-1507="Experimentelle Funktionen"
-1508="Über System"
-1509="Maßstab Benutzeroberfläche"
-1510="Hotkeys"
-1511="Einstellungen"
-1520="jetzt"
-1521="täglich"
-1522="wöchentlich"
-1523="jährlich"
-1524="nie"
-1550="nie"
-1551="immer"
-1552="während der Wiedergabe"
-1553="wenn in Vollbild"
-1590="klein"
-1591="normal"
-1592="groß"
-1593="erzwingen HiDPI 2X"
-2000="Wählen die Videodatei zu öffnen"
-2001="Wählen die linke Videodatei zu öffnen"
-2002="Wählen die rechte Videodatei zu öffnen"
-2003="Datei-Info"
-2004="Information nicht verfügbar"
-2005="Löschen von Dateien"
-?2006="Do you really want to completely remove this file?"
-?2007="Active decoders:"
-2010="Wählen einen Speicherort für Videoschnappschuss"
-2011="Nichts zu speichern!"
-2012="Schnappschuss ist nicht verfügbar!"
-2013="Hotkey ändern\n{0}"
-2014="Konflikten: {0}"
-3000="sView - Movie Player"
-3001="Version"
-?3002="Movie player allows you to play stereoscopic video.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0"
-?3003="A new version of sView is available on the official site www.sview.ru.\nPlease update your program."
-3004="System Info"
-4000="Schließen"
-4001="Abbrechen"
-4005="Rücksetzen"
-4006="Speichern"
-4007="Löschen"
-4008="Default"
-4009="Defaults"
-4010="Zuweisen"
-5000="[linke]"
-5001="[rechte]"
-5002="Dateiname(n)"
-5003="Video dimensions"
-5004="Ladezeit"
-5005="ms"
-5006="Pixelseitenverhältnis"
-5007="Pixel format"
-5008="(nicht in Metadaten gespeichert)"
-5009="(keine Metadaten übereinstimmen)"
-5010="Dauer"
-5011="(nicht in Metadaten gespeichert,\nsondern von Dateinamen detektiert)"
-5300="Titel"
-5301="Composer"
-5302="Artist"
-5303="Album artist"
-5304="Album"
-5305="Disc"
-5306="Nb. of discs"
-5307="Genre"
-5308="Kommentar"
-5309="Notes"
-5310="Beschreibung"
-5311="Publisher"
-5312="Copyright"
-5313="Encoder"
-5314="Engineer"
-5315="Source"
-5316="Creation time"
-5317="Datum"
-5318="Jahr"
-5319="Sprache"
-5320="Track"
-5321="Nb. of tracks"
-5322="Track gain"
-5323="Track peak"
-5324="Album gain"
-5325="Album peak"
-6000="Beenden"
-6001="Vollbildmodus/Fenstermodus"
-6002="FPS anzeigen"
-6003="Stereo-Format - Autoerkennung"
-6004="Stereo-Format - Mono"
-6005="Stereo-Format - Over/Under"
-6006="Stereo-Format - Side by side"
-6007="Datei info"
-6008="Wiedergabeliste - Zum ersten Element"
-6009="Wiedergabeliste - Zum letzten Element"
-6010="Wiedergabeliste - Zum vorherigen Element"
-6011="Wiedergabeliste - Zum nächsten Element"
-6012="Wiedergabeliste - Zum vorherigen Element [2]"
-6013="Wiedergabeliste - Zum nächsten Element [2]"
-6014="Wiedergabe/Pause"
-6015="Stoppen der Wiedergabe"
-6016="Suchen 5 Sekunden rückwärts"
-6017="5 Sekunden nach vorne zu suchen"
-6018="Film öffnen"
-6019="Videoschnappschuss speichern"
-6020="Die Datei löschen aus dem Dateisystem"
-6021="Ton aus/Ton ein"
-6022="Audio Lautstärke"
-6023="Audio Lautstärke"
-?6024="Previous audio track"
-?6025="Next audio track"
-?6026="Next subtitles track"
-?6027="Next subtitles track"
-6028="Copy angezeigt Untertiteltext"
-?6029="Open URL from clipboard"
-6030="Anzeigen/ausblenden Wiedergabeliste"
-6031="Zurücksetzen Bildeinstellung"
-6032="Zurücksetzen Bildposition"
-6033="L&R Vertauschen"
-6034="Gamma-Korrektur - verringern"
-6035="Gamma-Korrektur - erhöhen"
-6036="DX Trennung - verringern"
-6037="DX Trennung - erhöhen"
-6038="DY Trennung - verringern"
-6039="DY Trennung - erhöhen"
-6040="Winkelabstand - verringern"
-6041="Winkelabstand - erhöhen"
-6042="Um 90 Grad gegen Uhrzeigersinn drehen"
-6043="Um 90 Grad im Uhrzeigersinn drehen"
-6044="Drehen gegen den Uhrzeigersinn"
-6045="Im Uhrzeigersinn drehen"
-6046="Aktivieren / Deaktivieren der Panorama-Modus"
-6047="Navigieren nach links"
-6048="Navigieren nach rechts"
-6049="Navigieren nach oben"
-6050="Navigieren nach unten"
-6051="Zoomen"
-6052="Herauszoomen"
-6053="Y-Drehung - links"
-6054="Y-Drehung - rechts"
-6055="X-Drehung - nach oben"
-6056="X-Drehung - nach unten"
-6057="Aktivieren / Deaktivieren der Panorama-Modus"
+1002=L&R Vertauschen An
+1003=L&R Vertauschen Aus
+1004=Quellformat:
+1015=Öffnen anderen Film
+1020=Wiedergabe/Pause
+1021=Anzeigen/ausblenden Wiedergabeliste
+1022=Vorheriges Stück
+1023=Nachfolgendes Stück
+1029=Vollbildmodus/Fenstermodus
+1100=Medien
+1101=Film öffnen...
+1102=Videoschnappschuss speichern...
+1103=Quelle Stereo-Format
+1170=Datei-Info
+1104=Audiogerät
+1105=Zufällig
+1106=Zuletzt geöffnete Medien öffnen
+1107=GPU-basierter Video-Dekodierung
+1108=Web UI
+1109=Beenden
+1110=Einer Datei
+1111=Zwei Dateien
+1130=Quelle
+1131=Mono
+1132=Schielend
+1133=Parallel Pair
+1134=Over/Under (R/L)
+1135=Over/Under (L/R)
+1136=Interlaced
+1137=Anaglyph Rot/Cyan
+1138=Anaglyph Grün/Rot+Blau
+1139=Anaglyph Gelb/Blau
+1140=Rahmen-sequentielle
+1141=2x720p in 1080p tiled
+1142=2 Streams
+1160=Verlauf löschen
+1180=Ausschalten
+1181=Starten einmal
+1182=Starten jedesmal
+1185=Fehler anzeigen
+?1186=Web UI can not be started on {0} port!
+1200=Ansicht
+1201=Stereo-Ausgang
+1202=Vollbild
+1203=Zurückstellen
+1204=L&R Vertauschen
+1205=Seitenverhältnis
+1206=Glatte Filter
+1207=Bildeinstellung
+1208=Panorama
+1210=Stereo
+1211=Linke Bild
+1212=Rechte Bild
+1213=Parallel Pair
+1214=Cross-eyed
+1250=Quelle
+1251=Halten beim Neustart
+?1252=Heal anamorphic 1080p/720p
+1260=Nearest
+1261=Linear
+1262=Blend Deinterlace
+1270=Auf Standardwerte zurücksetzen
+1271=Helligkeit
+1272=Sättigung
+1273=Gamma
+1280=Fläche
+1281=Kugel
+1282=Zylinder
+1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+1300=Audio
+1301=keiner
+1302=Audio/Video Verzögerung
+1303=Bringen aus der Datei
+1320=Audio/Video Synchronisierung
+1321=Enter positive value if audio appears earlier than video and negative otherwise.
+1322=Audioverzögerung:
+1323=Sek.
+1350=Untertitel
+1351=keiner
+1353=Bringen aus der Datei
+1354=Schriftgröße
+1355=Parallax
+1356=Text parser
+1357=Platzierungen
+1358=Top
+1359=Boden
+1360=Plain text
+1361=Lite HTML
+1400=Gerät ändern
+1401=Über Plugin...
+1402=FPS Kontrolle
+1420=VSync
+1421=Zeige Meter
+1422=Reduce CPU usage
+1500=Hilfe
+1501=Über...
+1502=Nach Updates suchen
+1503=Lizenztext
+1504=Language
+1505=Blockieren Schlaf
+1506=Anwendertipps
+1507=Experimentelle Funktionen
+1508=Über System
+1509=Maßstab Benutzeroberfläche
+1510=Hotkeys
+1511=Einstellungen
+1520=jetzt
+1521=täglich
+1522=wöchentlich
+1523=jährlich
+1524=nie
+1550=nie
+1551=immer
+1552=während der Wiedergabe
+1553=wenn in Vollbild
+1590=klein
+1591=normal
+1592=groß
+1593=erzwingen HiDPI 2X
+2000=Wählen die Videodatei zu öffnen
+2001=Wählen die linke Videodatei zu öffnen
+2002=Wählen die rechte Videodatei zu öffnen
+2003=Datei-Info
+2004=Information nicht verfügbar
+2005=Löschen von Dateien
+?2006=Do you really want to completely remove this file?
+?2007=Active decoders:
+2010=Wählen einen Speicherort für Videoschnappschuss
+2011=Nichts zu speichern!
+2012=Schnappschuss ist nicht verfügbar!
+2013=Hotkey ändern\n{0}
+2014=Konflikten: {0}
+3000=sView - Movie Player
+3001=Version
+?3002=Movie player allows you to play stereoscopic video.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis program is distributed under GPL3.0
+?3003=A new version of sView is available on the official site www.sview.ru.\nPlease update your program.
+3004=System Info
+4000=Schließen
+4001=Abbrechen
+4005=Rücksetzen
+4006=Speichern
+4007=Löschen
+4008=Default
+4009=Defaults
+4010=Zuweisen
+5000=[linke]
+5001=[rechte]
+5002=Dateiname(n)
+5003=Video dimensions
+5004=Ladezeit
+5005=ms
+5006=Pixelseitenverhältnis
+5007=Pixel format
+5008=(nicht in Metadaten gespeichert)
+5009=(keine Metadaten übereinstimmen)
+5010=Dauer
+5011=(nicht in Metadaten gespeichert,\nsondern von Dateinamen detektiert)
+5300=Titel
+5301=Composer
+5302=Artist
+5303=Album artist
+5304=Album
+5305=Disc
+5306=Nb. of discs
+5307=Genre
+5308=Kommentar
+5309=Notes
+5310=Beschreibung
+5311=Publisher
+5312=Copyright
+5313=Encoder
+5314=Engineer
+5315=Source
+5316=Creation time
+5317=Datum
+5318=Jahr
+5319=Sprache
+5320=Track
+5321=Nb. of tracks
+5322=Track gain
+5323=Track peak
+5324=Album gain
+5325=Album peak
+6000=Beenden
+6001=Vollbildmodus/Fenstermodus
+6002=FPS anzeigen
+6003=Stereo-Format - Autoerkennung
+6004=Stereo-Format - Mono
+6005=Stereo-Format - Over/Under
+6006=Stereo-Format - Side by side
+6007=Datei info
+6008=Wiedergabeliste - Zum ersten Element
+6009=Wiedergabeliste - Zum letzten Element
+6010=Wiedergabeliste - Zum vorherigen Element
+6011=Wiedergabeliste - Zum nächsten Element
+6012=Wiedergabeliste - Zum vorherigen Element [2]
+6013=Wiedergabeliste - Zum nächsten Element [2]
+6014=Wiedergabe/Pause
+6015=Stoppen der Wiedergabe
+6016=Suchen 5 Sekunden rückwärts
+6017=5 Sekunden nach vorne zu suchen
+6018=Film öffnen
+6019=Videoschnappschuss speichern
+6020=Die Datei löschen aus dem Dateisystem
+6021=Ton aus/Ton ein
+6022=Audio Lautstärke
+6023=Audio Lautstärke
+?6024=Previous audio track
+?6025=Next audio track
+?6026=Previous subtitles track
+?6027=Next subtitles track
+6028=Copy angezeigt Untertiteltext
+?6029=Open URL from clipboard
+6030=Anzeigen/ausblenden Wiedergabeliste
+6031=Zurücksetzen Bildeinstellung
+6032=Zurücksetzen Bildposition
+6033=L&R Vertauschen
+6034=Gamma-Korrektur - verringern
+6035=Gamma-Korrektur - erhöhen
+6036=DX Trennung - verringern
+6037=DX Trennung - erhöhen
+6038=DY Trennung - verringern
+6039=DY Trennung - erhöhen
+6040=Winkelabstand - verringern
+6041=Winkelabstand - erhöhen
+6042=Um 90 Grad gegen Uhrzeigersinn drehen
+6043=Um 90 Grad im Uhrzeigersinn drehen
+6044=Drehen gegen den Uhrzeigersinn
+6045=Im Uhrzeigersinn drehen
+6046=Aktivieren / Deaktivieren der Panorama-Modus
+6047=Navigieren nach links
+6048=Navigieren nach rechts
+6049=Navigieren nach oben
+6050=Navigieren nach unten
+6051=Zoomen
+6052=Herauszoomen
+6053=Y-Drehung - links
+6054=Y-Drehung - rechts
+6055=X-Drehung - nach oben
+6056=X-Drehung - nach unten
+6057=Aktivieren / Deaktivieren der Panorama-Modus

sview-15_10.tar.gz/StMoviePlayer/lang/korean/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/korean/StMoviePlayer.lng Changed

@@ -2,246 +2,246 @@
 # @author Kirill Gavrilov
 # @translator Kwon Daesuk <hyntel@clunix.com>
 --------
-1002="좌/우 교체"
-1003="좌/우 복원"
-1004="소스 형식:"
-1015="다른 영상 열기"
-1020="재생/멈춤"
-1021="재생 목록 보이기/감추기"
-1022="앞 파일 재생"
-1023="다음 파일 재생"
-1029="전환\n전체화면/윈도우화면"
-1100="미디어"
-1101="파일 열기..."
-1102="스냅샷 저장..."
-1103="소스 스테레오 형식"
-?1170="File info"
-1104="오디오 장치"
-1105="셔플"
-1106="최근 파일"
-1107="GPU 비디오 디코딩"
-1108="웹 UI"
-1109="종료"
-1110="파일 하나에서 재생"
-1111="좌+우 각 파일에서 재생"
-1130="자동감지"
-1131="단일영상"
-1132="크로스-아이"
-1133="패럴렐 페어"
-1134="상/하 (R/L)"
-1135="상/하 (L/R)"
-1136="인터레이스"
-?1137="red/cyan"
-?1138="green/red+blue"
-?1139="yellow/blue"
-1140="순차 프레임"
-1141="2x720p in 1080p tiled"
-1142="2 스트림"
-1160="재생 기록 소거"
-1180="끄기"
-1181="한번만 실행"
-1182="매번 실행"
-1185="오류 보이기"
-1186="웹 UI {0} 포트에서 시작 불가!"
-1200="보기"
-1201="입체 출력"
-1202="전체 화면"
-1203="리셋"
-1204="좌/우 교체"
-1205="화면 비율"
-1206="Smooth 필터"
-1207="이미지 수정"
-?1208="Panorama"
-1210="Stereo"
-1211="왼쪽 View"
-1212="오른쪽 View"
-1213="패럴렐 페어"
-1214="크로스 아이"
-?1250="Source"
-1251="재시작시 유지"
-?1252="Heal anamorphic 1080p/720p"
-?1260="Nearest"
-?1261="Linear"
-?1262="Blend Deinterlace"
-1270="초기값 리셋"
-1271="밝기"
-?1272="Saturation"
-1273="감마"
-?1280="Plane"
-?1281="Sphere"
-?1282="Cylinder"
-?1283="Cubemap"
-?1285="Track orientation"
-?1286="Track orientation (poor)"
-?1300="Audio"
-1301="없음"
-1302="오디오/비디오 지연시간"
-1303="파일에서 불러오기"
-1320="오디오/비디오 동기화"
-1321="오디오가 화면보다 먼저 들리면 +값을, 반대이면 -값을 넣으시오"
-1322="오디오 지연:"
-1323="초(s)"
-1350="자막"
-1351="없음"
-1353="파일에서 불러오기"
-1354="폰트 크기"
-?1355="Parallax"
-?1356="Text parser"
-?1357="Placement"
-?1358="Top"
-?1359="Bottom"
-?1360="Plain text"
-?1361="Lite HTML"
-1400="장치 변경"
-?1401="About Plugin..."
-?1402="FPS 제어"
-?1420="VSync"
-?1421="Show Meter"
-1422="CPU 부하 감소"
-1500="도움말"
-1501="이 프로그램에 대해..."
-1502="업데이트 확인"
-1503="라이선스 문서"
-1504="언어 (Language)"
-1505="블록 슬리핑"
-1506="사용자 팁"
-1507="실험적 기능"
-1508="시스템에 대해"
-?1509="Interface Scale"
-?1510="Hotkeys"
-?1511="Settings"
-1520="지금"
-1521="매일"
-1522="매주"
-1523="매년"
-1524="하지않음"
-1550="하지않음"
-1551="항상"
-1552="재생중"
-1553="전체화면중"
-1590="작게"
-1591="보통"
-1592="크게"
-1593="HiDPI 2X 로"
-2000="재생할 비디오 파일을 선택하시오"
-2001="좌안 비디오 파일을 선택하시오"
-2002="우안 비디오 파일을 선택하시오"
-?2003="File Info"
-?2004="File information is unavailable"
-?2005="File deletion"
-?2006="Do you really want to completely remove this file?"
-?2007="Active decoders:"
-2010="스냅샷을 저장할 위치를 선택하시오"
-2011="저장할 수 없음!"
-2012="스냅샷 없음!"
-?2013="Assign new Hot Key for action\n{0}"
-?2014="Conflicts with: {0}"
-3000="sView - 3D 동영상 플레이어"
-3001="version"
-3002="이 동영상 플레이어는 스테레오스코픽 동영상을 재생할 수 있습니다.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\n이 프로그램은 GPL3.0 하에 배포됩니다."
-3003="sView 새 버전은 www.sview.ru 에서 얻으실 수 있습니다.\n 프로그램을 업데이트 하세요."
-?3004="System Info"
-4000="닫기"
-?4001="Cancel"
-4005="리셋"
-?4006="Save"
-?4007="Delete"
-?4008="Default"
-?4009="Defaults"
-?4010="Assign"
-?5000="[left]"
-?5001="[right]"
-?5002="File name(s)"
-?5003="Video dimensions"
-?5004="Load time"
-?5005="ms"
-?5006="Pixel ratio"
-?5007="Pixel format"
-?5008="(does not stored in metadata)"
-?5009="(does not match metadata)"
-?5010="Duration"
-?5011="(does not stored in metadata,\nbut detected from file name)"
-?5300="Title"
-?5301="Composer"
-?5302="Artist"
-?5303="Album artist"
-?5304="Album"
-?5305="Disc"
-?5306="Nb. of discs"
-?5307="Genre"
-?5308="Comment"
-?5309="Notes"
-?5310="Description"
-?5311="Publisher"
-?5312="Copyright"
-?5313="Encoder"
-?5314="Engineer"
-?5315="Source"
-?5316="Creation time"
-?5317="Date"
-?5318="Year"
-?5319="Language"
-?5320="Track"
-?5321="Nb. of tracks"
-?5322="Track gain"
-?5323="Track peak"
-?5324="Album gain"
-?5325="Album peak"
-6000="나가기"
-6001="전환 전체화면/윈도화면"
-?6002="Show/hide FPS meter"
-6003="입력 스테레오 형식: 자동감지"
-6004="입력 스테레오 형식: 모노"
-6005="입력 스테레오 형식: 상/하"
-6006="입력 스테레오 형식: 크로스-아이"
-?6007="Show file info"
-?6008="Playlist - Go to the first item"
-?6009="Playlist - Go to the last item"
-6010="앞 파일 재생"
-6011="다음 파일 재생"
-6012="앞 파일 재생 [2]"
-6013="다음 파일 재생 [2]"
-6014="재생/멈춤"
-?6015="Stop playback"
-?6016="Seek 5 seconds backward"
-?6017="Seek 5 seconds forward"
-6018="파일 열기"
-6019="스냅샷 저장"
-?6020="Delete the file from file system"
-?6021="Mute/unmute audio"
-?6022="Audio volume down"
-?6023="Audio volume up"
-?6024="Previous audio track"
-?6025="Next audio track"
-?6026="Next subtitles track"
-?6027="Next subtitles track"
-?6028="Copy displayed subtitles text"
-?6029="Open URL from clipboard"
-6030="재생 목록 보이기/감추기"
-?6031="Reset image adjustment"
-?6032="Reset image position"
-6033="좌/우 변경"
-?6034="Gamma correction - decrease"
-?6035="Gamma correction - increase"
-?6036="DX separation - decrease"
-?6037="DX separation - increase"
-?6038="DY separation - decrease"
-?6039="DY separation - increase"
-?6040="Angular separation - decrease"
-?6041="Angular separation - increase"
-?6042="Rotate 90 degrees counterclockwise"
-?6043="Rotate 90 degrees clockwise"
-?6044="Rotate counterclockwise"
-?6045="Rotate clockwise"
-?6046="Enable/disable panorama mode"
-?6047="Panning - navigate to the left"
-?6048="Panning - navigate to the right"
-?6049="Panning - navigate to the top"
-?6050="Panning - navigate to the bottom"
-?6051="Scale - increment"
-?6052="Scale - decrement"
-?6053="Y Rotation - left"
-?6054="Y Rotation - right"
-?6055="X Rotation - up"
-?6056="X Rotation - down"
-?6057="Enable/disable panorama mode"
+1002=좌/우 교체
+1003=좌/우 복원
+1004=소스 형식:
+1015=다른 영상 열기
+1020=재생/멈춤
+1021=재생 목록 보이기/감추기
+1022=앞 파일 재생
+1023=다음 파일 재생
+1029=전환\n전체화면/윈도우화면
+1100=미디어
+1101=파일 열기...
+1102=스냅샷 저장...
+1103=소스 스테레오 형식
+?1170=File info
+1104=오디오 장치
+1105=셔플
+1106=최근 파일
+1107=GPU 비디오 디코딩
+1108=웹 UI
+1109=종료
+1110=파일 하나에서 재생
+1111=좌+우 각 파일에서 재생
+1130=자동감지
+1131=단일영상
+1132=크로스-아이
+1133=패럴렐 페어
+1134=상/하 (R/L)
+1135=상/하 (L/R)
+1136=인터레이스
+?1137=red/cyan
+?1138=green/red+blue
+?1139=yellow/blue
+1140=순차 프레임
+1141=2x720p in 1080p tiled
+1142=2 스트림
+1160=재생 기록 소거
+1180=끄기
+1181=한번만 실행
+1182=매번 실행
+1185=오류 보이기
+1186=웹 UI {0} 포트에서 시작 불가!
+1200=보기
+1201=입체 출력
+1202=전체 화면
+1203=리셋
+1204=좌/우 교체
+1205=화면 비율
+1206=Smooth 필터
+1207=이미지 수정
+?1208=Panorama
+1210=Stereo
+1211=왼쪽 View
+1212=오른쪽 View
+1213=패럴렐 페어
+1214=크로스 아이
+?1250=Source
+1251=재시작시 유지
+?1252=Heal anamorphic 1080p/720p
+?1260=Nearest
+?1261=Linear
+?1262=Blend Deinterlace
+1270=초기값 리셋
+1271=밝기
+?1272=Saturation
+1273=감마
+?1280=Plane
+?1281=Sphere
+?1282=Cylinder
+?1283=Cubemap
+?1285=Track orientation
+?1286=Track orientation (poor)
+?1300=Audio
+1301=없음
+1302=오디오/비디오 지연시간
+1303=파일에서 불러오기
+1320=오디오/비디오 동기화
+1321=오디오가 화면보다 먼저 들리면 +값을, 반대이면 -값을 넣으시오
+1322=오디오 지연:
+1323=초(s)
+1350=자막
+1351=없음
+1353=파일에서 불러오기
+1354=폰트 크기
+?1355=Parallax
+?1356=Text parser
+?1357=Placement
+?1358=Top
+?1359=Bottom
+?1360=Plain text
+?1361=Lite HTML
+1400=장치 변경
+?1401=About Plugin...
+?1402=FPS 제어
+?1420=VSync
+?1421=Show Meter
+1422=CPU 부하 감소
+1500=도움말
+1501=이 프로그램에 대해...
+1502=업데이트 확인
+1503=라이선스 문서
+1504=언어 (Language)
+1505=블록 슬리핑
+1506=사용자 팁
+1507=실험적 기능
+1508=시스템에 대해
+?1509=Interface Scale
+?1510=Hotkeys
+?1511=Settings
+1520=지금
+1521=매일
+1522=매주
+1523=매년
+1524=하지않음
+1550=하지않음
+1551=항상
+1552=재생중
+1553=전체화면중
+1590=작게
+1591=보통
+1592=크게
+1593=HiDPI 2X 로
+2000=재생할 비디오 파일을 선택하시오
+2001=좌안 비디오 파일을 선택하시오
+2002=우안 비디오 파일을 선택하시오
+?2003=File Info
+?2004=File information is unavailable
+?2005=File deletion
+?2006=Do you really want to completely remove this file?
+?2007=Active decoders:
+2010=스냅샷을 저장할 위치를 선택하시오
+2011=저장할 수 없음!
+2012=스냅샷 없음!
+?2013=Assign new Hot Key for action\n{0}
+?2014=Conflicts with: {0}
+3000=sView - 3D 동영상 플레이어
+3001=version
+3002=이 동영상 플레이어는 스테레오스코픽 동영상을 재생할 수 있습니다.\n © {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\n이 프로그램은 GPL3.0 하에 배포됩니다.
+3003=sView 새 버전은 www.sview.ru 에서 얻으실 수 있습니다.\n 프로그램을 업데이트 하세요.
+?3004=System Info
+4000=닫기
+?4001=Cancel
+4005=리셋
+?4006=Save
+?4007=Delete
+?4008=Default
+?4009=Defaults
+?4010=Assign
+?5000=[left]
+?5001=[right]
+?5002=File name(s)
+?5003=Video dimensions
+?5004=Load time
+?5005=ms
+?5006=Pixel ratio
+?5007=Pixel format
+?5008=(does not stored in metadata)
+?5009=(does not match metadata)
+?5010=Duration
+?5011=(does not stored in metadata,\nbut detected from file name)
+?5300=Title
+?5301=Composer
+?5302=Artist
+?5303=Album artist
+?5304=Album
+?5305=Disc
+?5306=Nb. of discs
+?5307=Genre
+?5308=Comment
+?5309=Notes
+?5310=Description
+?5311=Publisher
+?5312=Copyright
+?5313=Encoder
+?5314=Engineer
+?5315=Source
+?5316=Creation time
+?5317=Date
+?5318=Year
+?5319=Language
+?5320=Track
+?5321=Nb. of tracks
+?5322=Track gain
+?5323=Track peak
+?5324=Album gain
+?5325=Album peak
+6000=나가기
+6001=전환 전체화면/윈도화면
+?6002=Show/hide FPS meter
+6003=입력 스테레오 형식: 자동감지
+6004=입력 스테레오 형식: 모노
+6005=입력 스테레오 형식: 상/하
+6006=입력 스테레오 형식: 크로스-아이
+?6007=Show file info
+?6008=Playlist - Go to the first item
+?6009=Playlist - Go to the last item
+6010=앞 파일 재생
+6011=다음 파일 재생
+6012=앞 파일 재생 [2]
+6013=다음 파일 재생 [2]
+6014=재생/멈춤
+?6015=Stop playback
+?6016=Seek 5 seconds backward
+?6017=Seek 5 seconds forward
+6018=파일 열기
+6019=스냅샷 저장
+?6020=Delete the file from file system
+?6021=Mute/unmute audio
+?6022=Audio volume down
+?6023=Audio volume up
+?6024=Previous audio track
+?6025=Next audio track
+?6026=Previous subtitles track
+?6027=Next subtitles track
+?6028=Copy displayed subtitles text
+?6029=Open URL from clipboard
+6030=재생 목록 보이기/감추기
+?6031=Reset image adjustment
+?6032=Reset image position
+6033=좌/우 변경
+?6034=Gamma correction - decrease
+?6035=Gamma correction - increase
+?6036=DX separation - decrease
+?6037=DX separation - increase
+?6038=DY separation - decrease
+?6039=DY separation - increase
+?6040=Angular separation - decrease
+?6041=Angular separation - increase
+?6042=Rotate 90 degrees counterclockwise
+?6043=Rotate 90 degrees clockwise
+?6044=Rotate counterclockwise
+?6045=Rotate clockwise
+?6046=Enable/disable panorama mode
+?6047=Panning - navigate to the left
+?6048=Panning - navigate to the right
+?6049=Panning - navigate to the top
+?6050=Panning - navigate to the bottom
+?6051=Scale - increment
+?6052=Scale - decrement
+?6053=Y Rotation - left
+?6054=Y Rotation - right
+?6055=X Rotation - up
+?6056=X Rotation - down
+?6057=Enable/disable panorama mode

sview-15_10.tar.gz/StMoviePlayer/lang/russian/StMoviePlayer.lng -> sview-15_11.tar.gz/StMoviePlayer/lang/russian/StMoviePlayer.lng Changed

@@ -1,247 +1,247 @@
 # Russian translation file for StMoviePlayer program
 # @author Kirill Gavrilov
 --------
-1002="Поменять ракурсы местами"
-1003="Отключить реверс ракурсов"
-1004="Исходный стереоформат:"
-1015="Открыть видеофайл"
-1020="Пауза/Воспроизведение"
-1021="Отобразить/Скрыть\nсписок файлов"
-1022="Предыдущий файл"
-1023="Следующий файл"
-1029="Оконный/Полноэкранный\nрежим просмотра"
-1100="Медиа"
-1101="Открыть видео..."
-1102="Сохранить кадр..."
-1103="Исходный стереоформат"
-1170="Информация о файле"
-1104="Аудио устройство"
-1105="Случайный порядок"
-1106="Последние файлы"
-1107="Декодирование видео на GPU"
-1108="Web UI"
-1109="Выход"
-1110="Из одного файла"
-1111="Левый+Правый файлы"
-1130="Исходный"
-1131="Моно"
-1132="Перекрёстная пара"
-1133="Параллельная пара"
-1134="Вертикальная пара (П/Л)"
-1135="Вертикальная пара (Л/П)"
-1136="Чересстрочный"
-1137="Анаглиф (Красно-Голубой)"
-1138="Анаглиф (Пурпурный)"
-1139="Анаглиф (Жёлтый)"
-1140="Чередование кадров"
-1141="2x720p in 1080p tiled"
-1142="2 потока"
-1160="Очистить историю"
-1180="Отключить"
-1181="Запустить один раз"
-1182="Запускать при старте"
-1185="Показывать ошибки"
-1186="Web-интерфейс не может быть запущен на порте {0}!"
-1200="Вид"
-1201="Вывод стерео"
-1202="Полный экран"
-1203="Сбросить"
-1204="Реверс ракурсов"
-1205="Соотношение сторон"
-1206="Сглаживание текстур"
-1207="Цветокоррекция"
-1208="Панорама"
-1210="Стерео"
-1211="Левый ракурс"
-1212="Правый ракурс"
-1213="Параллельная пара"
-1214="Перекрёстная пара"
-1140="Чередование кадров"
-1250="Исходное"
-1251="Запомнить"
-?1252="Heal anamorphic 1080p/720p"
-1260="Без сглаживания"
-1261="Линейное"
-1262="Blend Deinterlace"
-1270="Сбросить настройки"
-1271="Яркость"
-1272="Насыщенность"
-1273="Гамма"
-1280="Плоскость"
-1281="Сфера"
-1282="Цилиндр
-1283="Куб"
-1285="Отслеживать ориентацию"
-1286="Отслеживать ориентацию (poor)"
-1300="Аудио"
-1301="Без звука"
-1302="Задержка звука"
-1303="Добавить дорожку из файла"
-1320="Синхронизация видео со звуком"
-1321="Введите положительное значение, если звук опережает видео, и отрицательное в противном случае."
-1322="Задержка звука:"
-1323="секунд"
-1350="Субтитры"
-1351="Без титров"
-1353="Добавить файл"
-1400="Выбрать устройство"
-1401="О модуле..."
-1402="FPS Control"
-1420="Верт. синхронизация"
-1421="Отображать FPS"
-1422="Ограничить использование CPU"
-1500="Помощь"
-1501="О программе..."
-1502="Проверить обновления"
-1503="Открыть лицензию"
-1504="Language"
-1505="Блокировать спящий режим"
-1506="Подсказки"
-1507="Экспериментальные функции"
-1508="О системе"
-1509="Масштаб. интерфейса"
-1510="Горячие клавиши"
-1511="Настройки"
-1520="Сейчас"
-1521="Каждый день"
-1522="Каждую неделю"
-1523="Каждый год"
-1524="Никогда"
-1550="Никогда"
-1551="Всегда"
-1552="Во время воспроизведения"
-1553="В полноэкранном режиме"
-1354="Размер текста"
-1355="Параллакс"
-1356="Text parser"
-1357="Положение"
-1358="Сверху"
-1359="Снизу"
-1360="Plain text"
-1361="Lite HTML"
-1590="Мелко"
-1591="Нормально"
-1592="Крупно"
-1593="Форсировать HiDPI 2X"
-2000="Выберите видеофайл"
-2001="Выберите видеофайл с ЛЕВЫМ ракурсом"
-2002="Выберите видеофайл с ПРАВЫМ ракурсом"
-2003="Информация о файле"
-2004="Информация о файле недоступна"
-2005="Удаление файла"
-2006="Вы действительно хотите\nудалить файл минуя корзину?"
-2007="Активные декодеры:"
-2010="Выберите путь для сохранения картинки"
-2011="Ничего не открыто!"
-2012="Изображение недоступно для сохранения!"
-2013="Назначить новую комбинацию для\n{0}"
-2014="Конфликтует с: {0}"
-3000="sView - программа для воспроизведения видео"
-3001="версия"
-3002="Программа воспроизводит стереоскопическое видео.\n © {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}\n\nПрограмма распространяется на условиях GPL3.0"
-3003="Доступно обновление программы.\nВы можете загрузить новую версию с официального сайта www.sview.ru."
-3004="Информация о системе"
-4000="Закрыть"
-4001="Отменить"
-4005="Сбросить"
-4006="Сохранить"
-4007="Удалить"
-4008="По умолчанию"
-4009="Сбросить всё"
-4010="Установить"
-5000="[левый]"
-5001="[правый]"
-5002="Имена файлов"
-5003="Разрешение видео"
-5004="Время загрузки"
-5005="мс"
-5006="Пропорции пикселя"
-5007="Пиксельный формат"
-5008="(информация отсутствует в метаданных)"
-5009="(не соответствует метаданным)"
-5010="Продолжительность"
-5011="(информация отсутствует в метаданных,\nно была определена по имени файла)"
-5300="Заголовок"
-5301="Композитор"
-5302="Artist"
-5303="Album artist"
-5304="Альбом"
-5305="Диск"
-5306="Количество дисков"
-5307="Жанр"
-5308="Комментарий"
-5309="Примечания"
-5310="Описание"
-5311="Publisher"
-5312="Copyright"
-5313="Encoder"
-5314="Engineer"
-5315="Источник"
-5316="Дата создания"
-5317="Дата"
-5318="Год"
-5319="Язык"
-5320="Track"
-5321="Nb. of tracks"
-5322="Track gain"
-5323="Track peak"
-5324="Album gain"
-5325="Album peak"
-6000="Выход из программы"
-6001="Активирование полноэкранного режима"
-6002="Отображение FPS"
-6003="Стереоформат - Автоопределение"
-6004="Стереоформат - Моно"
-6005="Стереоформат - Вертикальная пара"
-6006="Стереоформат - Перекрёстная пара"
-6007="Информация о файле"
-6008="Список файлов - Перейти к первому элементу"
-6009="Список файлов - Перейти к последнему элементу"
-6010="Список файлов - Перейти к предыдущему элементу"
-6011="Список файлов - Перейти к следующему элементу"
-6012="Список файлов - Перейти к предыдущему элементу [2]"
-6013="Список файлов - Перейти к следующему элементу [2]"
-6014="Пауза/Воспроизведение"
-6015="Стоп"
-6016="Перемотать на 5 секунд назад"
-6017="Перемотать на 5 секунд вперёд"
-6018="Открыть файл"
-6019="Сохранить кадр"
-6020="Удалить файл из файловой системы"
-6021="Заглушить звук"
-6022="Понизить громкость звука"
-6023="Повысить громкость звука"
-6024="Предыдущая аудиодорожка"
-6025="Следующая аудиодорожка"
-6026="Предыдущие субтитры"
-6027="Следующие субтитры"
-6028="Скопировать текст субтитров в буфер обмена"
-6029="Открыть путь из буфера обмена"
-6030="Отобразить/Скрыть список файлов"
-6031="Сбросить настройки цвета"
-6032="Сбросить позицию картинки"
-6033="Реверс ракурсов"
-6034="Гамма коррекция - понизить коэффициент"
-6035="Гамма коррекция - повысить коэффициент"
-6036="DX разделение ракурсов - уменьшить"
-6037="DX разделение ракурсов - увеличить"
-6038="DY разделение ракурсов - уменьшить"
-6039="DY разделение ракурсов - увеличить"
-6040="Угловое разделение ракурсов - уменьшить"
-6041="Угловое разделение ракурсов - увеличить"
-6042="Поворот на 90 градусов против часовой стрелки"
-6043="Поворот на 90 градусов по часовой стрелке"
-6044="Поворот против часовой стрелки"
-6045="Поворот по часовой стрелке"
-6046="Включить/выключить панорамный режим"
-6047="Паннинг - движение налево"
-6048="Паннинг - движение направо"
-6049="Паннинг - движение наверх"
-6050="Паннинг - движение вниз"
-6051="Масштабирование - увеличить"
-6052="Масштабирование - уменьшить"
-6053="Y наклон - налево"
-6054="Y наклон - направо"
-6055="X наклон - наверх"
-6056="X наклон - вниз"
-6057="Включить/выключить панорамный режим"
+1002=Поменять ракурсы местами
+1003=Отключить реверс ракурсов
+1004=Исходный стереоформат:
+1015=Открыть видеофайл
+1020=Пауза/Воспроизведение
+1021=Отобразить/Скрыть\nсписок файлов
+1022=Предыдущий файл
+1023=Следующий файл
+1029=Оконный/Полноэкранный\nрежим просмотра
+1100=Медиа
+1101=Открыть видео...
+1102=Сохранить кадр...
+1103=Исходный стереоформат
+1170=Информация о файле
+1104=Аудио устройство
+1105=Случайный порядок
+1106=Последние файлы
+1107=Декодирование видео на GPU
+1108=Web UI
+1109=Выход
+1110=Из одного файла
+1111=Левый+Правый файлы
+1130=Исходный
+1131=Моно
+1132=Перекрёстная пара
+1133=Параллельная пара
+1134=Вертикальная пара (П/Л)
+1135=Вертикальная пара (Л/П)
+1136=Чересстрочный
+1137=Анаглиф (Красно-Голубой)
+1138=Анаглиф (Пурпурный)
+1139=Анаглиф (Жёлтый)
+1140=Чередование кадров
+1141=2x720p in 1080p tiled
+1142=2 потока
+1160=Очистить историю
+1180=Отключить
+1181=Запустить один раз
+1182=Запускать при старте
+1185=Показывать ошибки
+1186=Web-интерфейс не может быть запущен на порте {0}!
+1200=Вид
+1201=Вывод стерео
+1202=Полный экран
+1203=Сбросить
+1204=Реверс ракурсов
+1205=Соотношение сторон
+1206=Сглаживание текстур
+1207=Цветокоррекция
+1208=Панорама
+1210=Стерео
+1211=Левый ракурс
+1212=Правый ракурс
+1213=Параллельная пара
+1214=Перекрёстная пара
+1140=Чередование кадров
+1250=Исходное
+1251=Запомнить
+?1252=Heal anamorphic 1080p/720p
+1260=Без сглаживания
+1261=Линейное
+1262=Blend Deinterlace
+1270=Сбросить настройки
+1271=Яркость
+1272=Насыщенность
+1273=Гамма
+1280=Плоскость
+1281=Сфера
+1282=Цилиндр
+1283=Куб
+1285=Отслеживать ориентацию
+1286=Отслеживать ориентацию (poor)
+1300=Аудио
+1301=Без звука
+1302=Задержка звука
+1303=Добавить дорожку из файла
+1320=Синхронизация видео со звуком
+1321=Введите положительное значение, если звук опережает видео, и отрицательное в противном случае.
+1322=Задержка звука:
+1323=секунд
+1350=Субтитры
+1351=Без титров
+1353=Добавить файл
+1400=Выбрать устройство
+1401=О модуле...
+1402=FPS Control
+1420=Верт. синхронизация
+1421=Отображать FPS
+1422=Ограничить использование CPU
+1500=Помощь
+1501=О программе...
+1502=Проверить обновления
+1503=Открыть лицензию
+1504=Language
+1505=Блокировать спящий режим
+1506=Подсказки
+1507=Экспериментальные функции
+1508=О системе
+1509=Масштаб. интерфейса
+1510=Горячие клавиши
+1511=Настройки
+1520=Сейчас
+1521=Каждый день
+1522=Каждую неделю
+1523=Каждый год
+1524=Никогда
+1550=Никогда
+1551=Всегда
+1552=Во время воспроизведения
+1553=В полноэкранном режиме
+1354=Размер текста
+1355=Параллакс
+1356=Text parser
+1357=Положение
+1358=Сверху
+1359=Снизу
+1360=Plain text
+1361=Lite HTML
+1590=Мелко
+1591=Нормально
+1592=Крупно
+1593=Форсировать HiDPI 2X
+2000=Выберите видеофайл
+2001=Выберите видеофайл с ЛЕВЫМ ракурсом
+2002=Выберите видеофайл с ПРАВЫМ ракурсом
+2003=Информация о файле
+2004=Информация о файле недоступна
+2005=Удаление файла
+2006=Вы действительно хотите\nудалить файл минуя корзину?
+2007=Активные декодеры:
+2010=Выберите путь для сохранения картинки
+2011=Ничего не открыто!
+2012=Изображение недоступно для сохранения!
+2013=Назначить новую комбинацию для\n{0}
+2014=Конфликтует с: {0}
+3000=sView - программа для воспроизведения видео
+3001=версия
+3002=Программа воспроизводит стереоскопическое видео.\n © {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}\n\nПрограмма распространяется на условиях GPL3.0
+3003=Доступно обновление программы.\nВы можете загрузить новую версию с официального сайта www.sview.ru.
+3004=Информация о системе
+4000=Закрыть
+4001=Отменить
+4005=Сбросить
+4006=Сохранить
+4007=Удалить
+4008=По умолчанию
+4009=Сбросить всё
+4010=Установить
+5000=[левый]
+5001=[правый]
+5002=Имена файлов
+5003=Разрешение видео
+5004=Время загрузки
+5005=мс
+5006=Пропорции пикселя
+5007=Пиксельный формат
+5008=(информация отсутствует в метаданных)
+5009=(не соответствует метаданным)
+5010=Продолжительность
+5011=(информация отсутствует в метаданных,\nно была определена по имени файла)
+5300=Заголовок
+5301=Композитор
+5302=Artist
+5303=Album artist
+5304=Альбом
+5305=Диск
+5306=Количество дисков
+5307=Жанр
+5308=Комментарий
+5309=Примечания
+5310=Описание
+5311=Publisher
+5312=Copyright
+5313=Encoder
+5314=Engineer
+5315=Источник
+5316=Дата создания
+5317=Дата
+5318=Год
+5319=Язык
+5320=Track
+5321=Nb. of tracks
+5322=Track gain
+5323=Track peak
+5324=Album gain
+5325=Album peak
+6000=Выход из программы
+6001=Активирование полноэкранного режима
+6002=Отображение FPS
+6003=Стереоформат - Автоопределение
+6004=Стереоформат - Моно
+6005=Стереоформат - Вертикальная пара
+6006=Стереоформат - Перекрёстная пара
+6007=Информация о файле
+6008=Список файлов - Перейти к первому элементу
+6009=Список файлов - Перейти к последнему элементу
+6010=Список файлов - Перейти к предыдущему элементу
+6011=Список файлов - Перейти к следующему элементу
+6012=Список файлов - Перейти к предыдущему элементу [2]
+6013=Список файлов - Перейти к следующему элементу [2]
+6014=Пауза/Воспроизведение
+6015=Стоп
+6016=Перемотать на 5 секунд назад
+6017=Перемотать на 5 секунд вперёд
+6018=Открыть файл
+6019=Сохранить кадр
+6020=Удалить файл из файловой системы
+6021=Заглушить звук
+6022=Понизить громкость звука
+6023=Повысить громкость звука
+6024=Предыдущая аудиодорожка
+6025=Следующая аудиодорожка
+6026=Предыдущие субтитры
+6027=Следующие субтитры
+6028=Скопировать текст субтитров в буфер обмена
+6029=Открыть путь из буфера обмена
+6030=Отобразить/Скрыть список файлов
+6031=Сбросить настройки цвета
+6032=Сбросить позицию картинки
+6033=Реверс ракурсов
+6034=Гамма коррекция - понизить коэффициент
+6035=Гамма коррекция - повысить коэффициент
+6036=DX разделение ракурсов - уменьшить
+6037=DX разделение ракурсов - увеличить
+6038=DY разделение ракурсов - уменьшить
+6039=DY разделение ракурсов - увеличить
+6040=Угловое разделение ракурсов - уменьшить
+6041=Угловое разделение ракурсов - увеличить
+6042=Поворот на 90 градусов против часовой стрелки
+6043=Поворот на 90 градусов по часовой стрелке
+6044=Поворот против часовой стрелки
+6045=Поворот по часовой стрелке
+6046=Включить/выключить панорамный режим
+6047=Паннинг - движение налево
+6048=Паннинг - движение направо
+6049=Паннинг - движение наверх
+6050=Паннинг - движение вниз
+6051=Масштабирование - увеличить
+6052=Масштабирование - уменьшить
+6053=Y наклон - налево
+6054=Y наклон - направо
+6055=X наклон - наверх
+6056=X наклон - вниз
+6057=Включить/выключить панорамный режим

sview-15_10.tar.gz/StOutAnaglyph/StOutAnaglyph.cbp -> sview-15_11.tar.gz/StOutAnaglyph/StOutAnaglyph.cbp Changed

@@ -6,33 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/StOutAnaglyph" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StOutAnaglyph" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -64,11 +37,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StOutAnaglyph" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -254,8 +227,7 @@
 			<Option compilerVar="WINDRES" />
 			<Option target="WIN_vc_x86" />
 			<Option target="WIN_vc_AMD64" />
-			<Option target="WIN_gcc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 		</Unit>
 		<Unit filename="lang/chinese/language.lng">
 			<Option target="&lt;{~None~}&gt;" />

sview-15_10.tar.gz/StOutAnaglyph/StOutAnaglyph.cpp -> sview-15_11.tar.gz/StOutAnaglyph/StOutAnaglyph.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutAnaglyph, class providing stereoscopic output in Anaglyph format using StCore toolkit.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutAnaglyph library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutAnaglyph library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutAnaglyph.h"
@@ -201,7 +192,9 @@
 }
 
 void StOutAnaglyph::beforeClose() {
- mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ if(isMovable() && myWasUsed) {
+ mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ }
 mySettings->saveParam(ST_SETTING_GLASSES, params.Glasses);
 mySettings->saveParam(ST_SETTING_REDCYAN, params.RedCyan);
 mySettings->saveParam(ST_SETTING_AMBERBLUE, params.AmberBlue);

sview-15_10.tar.gz/StOutAnaglyph/StOutAnaglyph.h -> sview-15_11.tar.gz/StOutAnaglyph/StOutAnaglyph.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutAnaglyph, class providing stereoscopic output in Anaglyph format using StCore toolkit.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutAnaglyph library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutAnaglyph library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutAnaglyph_h_

sview-15_10.tar.gz/StOutAnaglyph/lang/chinese/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/chinese/StOutAnaglyph.lng Changed

sview-15_10.tar.gz/StOutAnaglyph/lang/czech/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/czech/StOutAnaglyph.lng Changed

sview-15_10.tar.gz/StOutAnaglyph/lang/english/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/english/StOutAnaglyph.lng Changed

sview-15_10.tar.gz/StOutAnaglyph/lang/french/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/french/StOutAnaglyph.lng Changed

@@ -1,20 +1,20 @@
 # French translation file for StOutAnaglyph library
 # @author gramoun for Kirill Gavrilov
 --------
-1000="Lunettes Anaglyphes"
-1001="Simples Lunettes avec filtre couleur. Couramment utilisées"
-1010="Type de verre"
-1011="Rouge-Bleue (R+B)"
-1012="Jaune-Bleue (RV+B)"
-1013="Vert-Magenta (V+RB)"
-1102="Filtre Rouge-Bleu"
-1120="Simple"
-1121="Optimisé"
-1122="Gris"
-1123="Foncé"
-1103="Filtre Jaune-Bleue"
-1130="Simple"
-1131="Dubios"
-2000="sView - Anaglyph Output module"
-2001="version"
-2002="© {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}\n\nThis library is distributed under LGPL3.0"
+1000=Lunettes Anaglyphes
+1001=Simples Lunettes avec filtre couleur. Couramment utilisées
+1010=Type de verre
+1011=Rouge-Bleue (R+B)
+1012=Jaune-Bleue (RV+B)
+1013=Vert-Magenta (V+RB)
+1102=Filtre Rouge-Bleu
+1120=Simple
+1121=Optimisé
+1122=Gris
+1123=Foncé
+1103=Filtre Jaune-Bleue
+1130=Simple
+1131=Dubios
+2000=sView - Anaglyph Output module
+2001=version
+2002=© {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}

sview-15_10.tar.gz/StOutAnaglyph/lang/german/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/german/StOutAnaglyph.lng Changed

sview-15_10.tar.gz/StOutAnaglyph/lang/korean/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/korean/StOutAnaglyph.lng Changed

@@ -1,20 +1,20 @@
 # English translation file for StOutAnaglyph library
 # @author Kirill Gavrilov
 --------
-?1000="Anaglyph glasses"
-?1001="Simple glasses with color-filters. Commonly used"
-?1010="Glasses type"
-?1011="Red-Cyan (R+GB)"
-?1012="Yellow-Blue (RG+B)"
-?1013="Green-Magenta (G+RB)"
-?1102="Red-Cyan filter"
-?1120="Simple"
-?1121="Optimized"
-?1122="Grayed"
-?1123="Dark"
-?1103="Yellow-Blue filter"
-?1130="Simple"
-?1131="Dubios"
-?2000="sView - Anaglyph Output module"
-?2001="version"
-?2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
+?1000=Anaglyph glasses
+?1001=Simple glasses with color-filters. Commonly used
+?1010=Glasses type
+?1011=Red-Cyan (R+GB)
+?1012=Yellow-Blue (RG+B)
+?1013=Green-Magenta (G+RB)
+?1102=Red-Cyan filter
+?1120=Simple
+?1121=Optimized
+?1122=Grayed
+?1123=Dark
+?1103=Yellow-Blue filter
+?1130=Simple
+?1131=Dubios
+?2000=sView - Anaglyph Output module
+?2001=version
+?2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}

sview-15_10.tar.gz/StOutAnaglyph/lang/russian/StOutAnaglyph.lng -> sview-15_11.tar.gz/StOutAnaglyph/lang/russian/StOutAnaglyph.lng Changed

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphGray.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphGray.shf Changed

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphGreen.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphGreen.shf Changed

@@ -2,19 +2,9 @@
 * Simple Green-Magenta Anaglyphs fragment shader.
 * Copyright © 2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutAnaglyph library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutAnaglyph library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform sampler2D texL, texR;

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphOptim.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphOptim.shf Changed

@@ -2,19 +2,9 @@
 * Optimized Anaglyphs (StereoVision) fragment shader.
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutAnaglyph library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutAnaglyph library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 // http://research.csc.ncsu.edu/stereographics/LS.pdf

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphSimple.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphSimple.shf Changed

@@ -2,19 +2,9 @@
 * Simple Anaglyphs fragment shader.
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutAnaglyph library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutAnaglyph library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform sampler2D texL, texR;

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphTrue.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphTrue.shf Changed

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphYellow.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphYellow.shf Changed

@@ -2,19 +2,9 @@
 * Simple Yellow Anaglyphs fragment shader.
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutAnaglyph library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutAnaglyph library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform sampler2D texL, texR;

sview-15_10.tar.gz/StOutAnaglyph/shaders/fAnaglyphYellowDubois.shf -> sview-15_11.tar.gz/StOutAnaglyph/shaders/fAnaglyphYellowDubois.shf Changed

sview-15_10.tar.gz/StOutAnaglyph/shaders/vAnaglyph.shv -> sview-15_11.tar.gz/StOutAnaglyph/shaders/vAnaglyph.shv Changed

sview-15_10.tar.gz/StOutDistorted/StOutDistorted.cbp -> sview-15_11.tar.gz/StOutDistorted/StOutDistorted.cbp Changed

@@ -6,33 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStOutDistorted" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StOutDistorted" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -64,11 +37,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StOutDistorted" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -249,9 +222,8 @@
 		<Unit filename="StOutDistorted.cpp" />
 		<Unit filename="StOutDistorted.h" />
 		<Unit filename="StOutDistorted.rc">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="lang/chinese/language.lng">

sview-15_10.tar.gz/StOutDistorted/StOutDistorted.cpp -> sview-15_11.tar.gz/StOutDistorted/StOutDistorted.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutDistorted, class providing stereoscopic output in anamorph side by side format using StCore toolkit.
 * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutDual library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutDual library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutDistorted.h"
@@ -22,6 +13,7 @@
 #include <StGL/StGLEnums.h>
 #include <StGL/StGLProgram.h>
 #include <StGL/StGLFrameBuffer.h>
+#include <StGL/StGLArbFbo.h>
 #include <StGLCore/StGLCore20.h>
 #include <StSettings/StSettings.h>
 #include <StSettings/StTranslations.h>
@@ -33,25 +25,10 @@
 #ifdef ST_HAVE_LIBOVR
 
 #include <OVR.h>
-//#include <OVR_CAPI_GL.h> // broken SDK
-#include <../Src/OVR_CAPI_GL.h>
+#include <OVR_CAPI_GL.h>
 
 #ifdef _MSC_VER
- #ifdef _DEBUG
- #if defined(_WIN64) || defined(__WIN64__)
- #pragma comment(lib, "libovr64d.lib")
- #else
- #pragma comment(lib, "libovrd.lib")
- #endif
- #else
- #if defined(_WIN64) || defined(__WIN64__)
- #pragma comment(lib, "libovr64.lib")
- #else
- #pragma comment(lib, "libovr.lib")
- #endif
- #endif
- #pragma comment(lib, "Winmm.lib")
- #pragma comment(lib, "Ws2_32.lib") // requires Windows Vista+
+ #pragma comment(lib, "LibOVR.lib")
 #endif
 
 #endif
@@ -63,7 +40,6 @@
 static const char ST_SETTING_DEVICE_ID[] = "deviceId";
 static const char ST_SETTING_WINDOWPOS[] = "windowPos";
 static const char ST_SETTING_LAYOUT[] = "layout";
- static const char ST_SETTING_ANAMORPH[] = "anamorph";
 static const char ST_SETTING_MONOCLONE[] = "monoClone";
 static const char ST_SETTING_MARGINS[] = "margins";
 static const char ST_SETTING_WARP_COEF[] = "warpCoef";
@@ -80,6 +56,8 @@
 STTR_PARAMETER_LAYOUT = 1110,
 STTR_PARAMETER_LAYOUT_SBS = 1111,
 STTR_PARAMETER_LAYOUT_OVERUNDER = 1112,
+ STTR_PARAMETER_LAYOUT_SBS_ANAMORPH = 1113,
+ STTR_PARAMETER_LAYOUT_OVERUNDER_ANAMORPH = 1114,
 STTR_PARAMETER_DISTORTION = 1120,
 STTR_PARAMETER_DISTORTION_OFF = 1121,
 STTR_PARAMETER_MONOCLONE = 1123,
@@ -312,7 +290,6 @@
 void StOutDistorted::getOptions(StParamsList& theList) const {
 if(myDevice != DEVICE_OCULUS) {
 theList.add(params.Layout);
- theList.add(params.Anamorph);
 }
 theList.add(params.MonoClone);
 }
@@ -332,16 +309,23 @@
 myChromAb(0.996f, -0.004f, 1.014f, 0.0f),
 //myChromAb(1.0f, 0.0f, 1.0f, 0.0f),
 myOvrHmd(NULL),
+ myOvrSizeX(0),
+ myOvrSizeY(0),
+#ifdef ST_HAVE_LIBOVR
+ myOvrSwapTexture(NULL),
+ myOvrMirrorTexture(NULL),
+ myOvrMirrorFbo(0),
+#endif
 myToReduceGui(false),
 myToShowCursor(true),
 myToCompressMem(myInstancesNb.increment() > 1),
 myIsBroken(false),
- myIsStereoOn(false) {
-
+ myIsStereoOn(false),
+ myIsHdmiPack(false) {
 #ifdef ST_HAVE_LIBOVR
- ovr_Initialize();
+ myOvrSwapFbo[0] = 0;
+ myOvrSwapFbo[1] = 0;
 #endif
-
 const StSearchMonitors& aMonitors = StWindow::getMonitors();
 StTranslations aLangMap(getResourceManager(), ST_OUT_PLUGIN_NAME);
 
@@ -354,21 +338,40 @@
 + aDescr.format("2013-2015", "kirill@sview.ru", "www.sview.ru");
 
 // detect connected displays
- int aSupportLevel = ST_DEVICE_SUPPORT_NONE;
+ int aSupportOculus = ST_DEVICE_SUPPORT_NONE;
+ int aSupportParallel = ST_DEVICE_SUPPORT_NONE;
+ bool isHdmiPack = false;
 for(size_t aMonIter = 0; aMonIter < aMonitors.size(); ++aMonIter) {
 const StMonitor& aMon = aMonitors[aMonIter];
 if(aMon.getPnPId().isStartsWith(stCString("OVR"))) {
 // Oculus Rift
- aSupportLevel = ST_DEVICE_SUPPORT_HIGHT;
+ aSupportOculus = ST_DEVICE_SUPPORT_HIGHT;
 break;
+ } else if(aMon.getVRect().width() == 1920
+ && aMon.getVRect().height() == 2205) {
+ aSupportParallel = ST_DEVICE_SUPPORT_HIGHT;
+ isHdmiPack = true;
+ } else if(aMon.getVRect().width() == 1280
+ && aMon.getVRect().height() == 1470) {
+ aSupportParallel = ST_DEVICE_SUPPORT_HIGHT;
+ isHdmiPack = true;
 }
 }
 
+#ifdef ST_HAVE_LIBOVR
+ const ovrResult anOvrRes = ovr_Initialize(NULL);
+ if(!OVR_SUCCESS(anOvrRes)) {
+ ST_ERROR_LOG("StOutDistorted, OVR initialization has failed!");
+ } else {
+ aSupportOculus = ST_DEVICE_SUPPORT_HIGHT;
+ }
+#endif
+
 // devices list
 StHandle<StOutDevice> aDevDistorted = new StOutDevice();
 aDevDistorted->PluginId = ST_OUT_PLUGIN_NAME;
 aDevDistorted->DeviceId = "Distorted";
- aDevDistorted->Priority = ST_DEVICE_SUPPORT_NONE;
+ aDevDistorted->Priority = aSupportParallel;
 aDevDistorted->Name = aLangMap.changeValueId(STTR_DISTORTED_NAME, "TV (parallel pair)");
 aDevDistorted->Desc = aLangMap.changeValueId(STTR_DISTORTED_DESC, "Distorted Output");
 myDevices.add(aDevDistorted);
@@ -376,7 +379,7 @@
 StHandle<StOutDevice> aDevOculus = new StOutDevice();
 aDevOculus->PluginId = ST_OUT_PLUGIN_NAME;
 aDevOculus->DeviceId = "Oculus";
- aDevOculus->Priority = aSupportLevel;
+ aDevOculus->Priority = aSupportOculus;
 aDevOculus->Name = aLangMap.changeValueId(STTR_OCULUS_NAME, "Oculus Rift");
 aDevOculus->Desc = aLangMap.changeValueId(STTR_OCULUS_DESC, "Distorted Output");
 myDevices.add(aDevOculus);
@@ -388,16 +391,16 @@
 }
 
 // Distortion parameters
- params.Anamorph = new StBoolParamNamed(false, "Anamorph");
- mySettings->loadParam(ST_SETTING_ANAMORPH, params.Anamorph);
 params.MonoClone = new StBoolParamNamed(false, aLangMap.changeValueId(STTR_PARAMETER_MONOCLONE, "Show Mono in Stereo"));
 mySettings->loadParam(ST_SETTING_MONOCLONE, params.MonoClone);
 
 // Layout option
- StHandle<StEnumParam> aLayoutParam = new StEnumParam(LAYOUT_SIDE_BY_SIDE,
+ StHandle<StEnumParam> aLayoutParam = new StEnumParam(isHdmiPack ? LAYOUT_OVER_UNDER : LAYOUT_SIDE_BY_SIDE_ANAMORPH,
 aLangMap.changeValueId(STTR_PARAMETER_LAYOUT, "Layout"));
- aLayoutParam->changeValues().add(aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_SBS, "Side-by-Side"));
- aLayoutParam->changeValues().add(aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_OVERUNDER, "Top-and-Bottom"));
+ aLayoutParam->changeValues().add(aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_SBS_ANAMORPH, "Side-by-Side (Anamorph)"));
+ aLayoutParam->changeValues().add(aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_OVERUNDER_ANAMORPH, "Top-and-Bottom (Anamorph)"));
+ aLayoutParam->changeValues().add(aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_SBS, "Side-by-Side"));
+ aLayoutParam->changeValues().add(aLangMap.changeValueId(STTR_PARAMETER_LAYOUT_OVERUNDER, "Top-and-Bottom") + (isHdmiPack ? " [HDMI]" : ""));
 params.Layout = aLayoutParam;
 mySettings->loadParam(ST_SETTING_LAYOUT, params.Layout);
 
@@ -409,6 +412,7 @@
 }
 StWindow::setPlacement(aRect, true);
 }
+ checkHdmiPack();
 StWindow::setTitle("sView - Distorted Renderer");
 
 StRectI_t aMargins;
@@ -428,6 +432,30 @@
 
 void StOutDistorted::releaseResources() {
 if(!myContext.isNull()) {
+ #ifdef ST_HAVE_LIBOVR
+ if(myOvrSwapFbo[0] != 0) {
+ myContext->arbFbo->glDeleteFramebuffers(2, myOvrSwapFbo);
+ myOvrSwapFbo[0] = 0;
+ myOvrSwapFbo[1] = 0;
+ }
+ if(myOvrSwapTexture != NULL) {
+ ovr_DestroySwapTextureSet(myOvrHmd, myOvrSwapTexture);
+ myOvrSwapTexture = NULL;
+ }
+ if(myOvrMirrorFbo != 0) {
+ myContext->arbFbo->glDeleteFramebuffers(1, &myOvrMirrorFbo);
+ myOvrMirrorFbo = NULL;
+ }
+ if(myOvrMirrorTexture != NULL) {
+ ovr_DestroyMirrorTexture(myOvrHmd, &myOvrMirrorTexture->Texture);
+ myOvrMirrorTexture = NULL;
+ }
+ if(myOvrHmd != NULL) {
+ ovr_Destroy(myOvrHmd);
+ myOvrHmd = NULL;
+ }
+ #endif
+
 myProgramFlat->release(*myContext);
 myProgramBarrel->release(*myContext);
 myFrVertsBuf .release(*myContext);
@@ -447,7 +475,9 @@
 }
 
 void StOutDistorted::beforeClose() {
- mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ if(isMovable() && myWasUsed) {
+ mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ }
 
 StRectI_t aMargins;
 aMargins.left() = myBarMargins.left;
@@ -456,7 +486,6 @@
 aMargins.bottom() = myBarMargins.bottom;
 
 mySettings->saveParam(ST_SETTING_LAYOUT, params.Layout);
- mySettings->saveParam(ST_SETTING_ANAMORPH, params.Anamorph);
 mySettings->saveParam(ST_SETTING_MONOCLONE, params.MonoClone);
 mySettings->saveInt32Rect(ST_SETTING_MARGINS, aMargins);
 mySettings->saveFloatVec4(ST_SETTING_WARP_COEF, myBarrelCoef);
@@ -478,14 +507,6 @@
 
 void StOutDistorted::close() {
 beforeClose();
-
-#ifdef ST_HAVE_LIBOVR
- if(myOvrHmd != NULL) {
- ovrHmd_Destroy(myOvrHmd);
- myOvrHmd = NULL;
- }
-#endif
-
 StWindow::params.VSyncMode->signals.onChanged -= stSlot(this, &StOutDistorted::doSwitchVSync);
 myToResetDevice = false;
 releaseResources();
@@ -501,6 +522,7 @@
 // initialize GL context
 myContext = StWindow::getContext();
 myContext->setMessagesQueue(myMsgQueue);
+ myIsBroken = false;
 if(!myContext->isGlGreaterEqual(2, 0)) {
 myMsgQueue->pushError(stCString("OpenGL 2.0 is required by Distorted Output"));
 myIsBroken = true;
@@ -558,65 +580,66 @@
 
 #ifdef ST_HAVE_LIBOVR
 if(myDevice == DEVICE_OCULUS) {
- myOvrHmd = ovrHmd_Create(0);
- if(myOvrHmd == NULL) {
- myMsgQueue->pushError(stCString("Oculus Rift is not connected!"));
- myOvrHmd = ovrHmd_CreateDebug(ovrHmd_DK1);
- //myOvrHmd = ovrHmd_CreateDebug(ovrHmd_DK2);
- if(myOvrHmd == NULL) {
- myMsgQueue->pushError(stCString("Can not create debug libOVR device!"));
- }
+ ovrGraphicsLuid aLuid;
+ const ovrResult anOvrRes = ovr_Create(&myOvrHmd, &aLuid);
+ if(myOvrHmd == NULL
+ || !OVR_SUCCESS(anOvrRes)) {
+ myMsgQueue->pushError(stCString("StOutDistorted, Oculus Rift is not connected!"));
+ myOvrHmd = NULL;
+ return true;
 }
 }
 
 if(myOvrHmd != NULL) {
- ovrGLConfig aCfg;
- aCfg.OGL.Header.API = ovrRenderAPI_OpenGL;
- aCfg.OGL.Header.BackBufferSize.w = myOvrHmd->Resolution.w;
- aCfg.OGL.Header.BackBufferSize.h = myOvrHmd->Resolution.h;
- aCfg.OGL.Header.Multisample = 1;
- #ifdef _WIN32
- aCfg.OGL.Window = (HWND )getNativeOglWin();
- aCfg.OGL.DC = (HDC )getNativeOglDC();
- #elif defined(__ANDROID__)
- //
- #elif defined(__linux__)
- //aCfg.OGL.Disp = getNativeXDisplay();
- #endif
- ovrEyeRenderDesc anEyeRenderDesc[2];
- if(!ovrHmd_ConfigureRendering(myOvrHmd, &aCfg.Config,
- ovrDistortionCap_Chromatic | ovrDistortionCap_Vignette | ovrDistortionCap_TimeWarp | ovrDistortionCap_Overdrive,
- myOvrHmd->DefaultEyeFov, anEyeRenderDesc)) {
- myMsgQueue->pushError(stCString("ovrHmd_ConfigureRendering() FAILED"));
- } else {
- #ifdef _WIN32
- if(!ovrHmd_AttachToWindow(myOvrHmd, aCfg.OGL.Window, NULL, NULL)) {
- myMsgQueue->pushError(stCString("ovrHmd_AttachToWindow() FAILED!"));
- } else {
- ovrSizei aRecSizeL = ovrHmd_GetFovTextureSize(myOvrHmd, ovrEye_Left,
- myOvrHmd->DefaultEyeFov[0], 1.0f);
- ovrSizei aRecSizeR = ovrHmd_GetFovTextureSize(myOvrHmd, ovrEye_Right,
- myOvrHmd->DefaultEyeFov[1], 1.0f);
-
- //ovrHmd_SetEnabledCaps (myOvrHmd, ovrHmdCap_LowPersistence | ovrHmdCap_DynamicPrediction);
- //ovrHmd_ConfigureTracking(myOvrHmd, ovrTrackingCap_Orientation | ovrTrackingCap_MagYawCorrection | ovrTrackingCap_Position, 0);
-
- ST_DEBUG_LOG("libOVR Resolution: " + myOvrHmd->Resolution.w + "x" + myOvrHmd->Resolution.h
- + "; eyeRectL= " + aRecSizeL.w + "x" + aRecSizeL.h
- + "; eyeRectR= " + aRecSizeR.w + "x" + aRecSizeR.h);
- if(isMovable()) {
- StRect<int32_t> aRect = StWindow::getPlacement();
- aRect.right() = aRect.left() + myOvrHmd->Resolution.w;
- aRect.bottom() = aRect.top() + myOvrHmd->Resolution.h;
- StWindow::setPlacement(aRect, false);
- }
- }
- #endif
+ ovrHmdDesc anHmdDesc = ovr_GetHmdDesc(myOvrHmd);
+ ovrSizei aWinSize = { anHmdDesc.Resolution.w / 2, anHmdDesc.Resolution.h / 2 };
+
+ ST_DEBUG_LOG("libOVR Resolution: " + anHmdDesc.Resolution.w + "x" + anHmdDesc.Resolution.h);
+ if(isMovable()) {
+ StRect<int32_t> aRect = StWindow::getPlacement();
+ aRect.right() = aRect.left() + aWinSize.w;
+ aRect.bottom() = aRect.top() + aWinSize.h;
+ StWindow::setPlacement(aRect, false);
 }
+
+ ovrResult anOvrRes = ovr_CreateMirrorTextureGL(myOvrHmd, GL_SRGB8_ALPHA8, aWinSize.w, aWinSize.h, (ovrTexture** )&myOvrMirrorTexture);
+ if(!OVR_SUCCESS(anOvrRes)) {
+ myMsgQueue->pushError(stCString("StOutDistorted, Failed to create mirror texture!"));
+ myIsBroken = true;
+ return true;
+ }
+
+ const GLuint anFboReadBack = myContext->stglFramebufferRead();
+ myContext->arbFbo->glGenFramebuffers(1, &myOvrMirrorFbo);
+ myContext->stglBindFramebufferRead(myOvrMirrorFbo);
+ myContext->arbFbo->glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, myOvrMirrorTexture->OGL.TexId, 0);
+ myContext->stglBindFramebufferRead(anFboReadBack);
+
+ ovrSizei anEyeSizes[2] = {
+ ovr_GetFovTextureSize(myOvrHmd, ovrEye_Left, anHmdDesc.DefaultEyeFov[ovrEye_Left], 1),
+ ovr_GetFovTextureSize(myOvrHmd, ovrEye_Right, anHmdDesc.DefaultEyeFov[ovrEye_Right], 1)
+ };
+ myOvrSizeX = stMax(anEyeSizes[0].w, anEyeSizes[1].w);
+ myOvrSizeY = stMax(anEyeSizes[0].h, anEyeSizes[1].h);
+ anOvrRes = ovr_CreateSwapTextureSetGL(myOvrHmd, GL_SRGB8_ALPHA8, myOvrSizeX * 2, myOvrSizeY, &myOvrSwapTexture);
+ if(!OVR_SUCCESS(anOvrRes)
+ || myOvrSwapTexture->TextureCount < 2) {
+ myMsgQueue->pushError(stCString("StOutDistorted, Failed to create swap texture!"));
+ myIsBroken = true;
+ return true;
+ }
+
+ myOvrSwapTexture->CurrentIndex = 0;
+ myContext->arbFbo->glGenFramebuffers(2, myOvrSwapFbo);
+ myContext->stglBindFramebufferRead(myOvrSwapFbo[0]);
+ myContext->arbFbo->glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+ ((ovrGLTexture* )&myOvrSwapTexture->Textures[0])->OGL.TexId, 0);
+ myContext->stglBindFramebufferRead(myOvrSwapFbo[1]);
+ myContext->arbFbo->glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+ ((ovrGLTexture* )&myOvrSwapTexture->Textures[1])->OGL.TexId, 0);
+ myContext->stglBindFramebufferRead(anFboReadBack);
 }
 #endif
-
- myIsBroken = false;
 return true;
 }
 
@@ -642,14 +665,22 @@
 StArray<StGLVec4> aVerts(4);
 const GLfloat aCurLeft = GLfloat(-1.0 + theCursorPos.x() * 2.0);
 const GLfloat aCurTop = GLfloat( 1.0 - theCursorPos.y() * 2.0);
- GLfloat aCurWidth = 2.0f * GLfloat(myCursor->getSizeX()) / GLfloat(myFrBuffer->getVPSizeX());
- GLfloat aCurHeight = 2.0f * GLfloat(myCursor->getSizeY()) / GLfloat(myFrBuffer->getVPSizeY());
- if(params.Anamorph->getValue()
- && myDevice != DEVICE_OCULUS) {
- if(params.Layout->getValue() == LAYOUT_OVER_UNDER) {
- aCurHeight *= 0.5;
- } else {
- aCurWidth *= 0.5;
+ const int aVPSizeX = myOvrSizeX != 0 ? myOvrSizeX : myFrBuffer->getVPSizeX();
+ const int aVPSizeY = myOvrSizeY != 0 ? myOvrSizeY : myFrBuffer->getVPSizeY();
+
+ GLfloat aCurWidth = 2.0f * GLfloat(myCursor->getSizeX()) / GLfloat(aVPSizeX);
+ GLfloat aCurHeight = 2.0f * GLfloat(myCursor->getSizeY()) / GLfloat(aVPSizeY);
+ if(myDevice != DEVICE_OCULUS) {
+ switch(params.Layout->getValue()) {
+ case LAYOUT_SIDE_BY_SIDE_ANAMORPH:
+ aCurWidth *= 0.5;
+ break;
+ case LAYOUT_OVER_UNDER_ANAMORPH:
+ aCurHeight *= 0.5;
+ break;
+ case LAYOUT_SIDE_BY_SIDE:
+ case LAYOUT_OVER_UNDER:
+ break;
 }
 }
 if(theView == ST_DRAW_LEFT) {
@@ -683,6 +714,22 @@
 myContext->core20fwd->glDisable(GL_BLEND);
 }
 
+bool StOutDistorted::hasOrientationSensor() const {
+ if(myOvrHmd != NULL) {
+ return true;
+ }
+ return StWindow::hasOrientationSensor();
+}
+
+StQuaternion<double> StOutDistorted::getDeviceOrientation() const {
+ if(StWindow::toTrackOrientation()
+ && myOvrHmd != NULL
+ && !myIsBroken) {
+ return myOvrOrient;
+ }
+ return StWindow::getDeviceOrientation();
+}
+
 GLfloat StOutDistorted::getLensDist() const {
 return (myIsStereoOn && myDevice == DEVICE_OCULUS) ? 0.1453f : 0.0f;
 }
@@ -697,7 +744,25 @@
 return 0.8f;
 }
 
+void StOutDistorted::checkHdmiPack() {
+ myIsHdmiPack = false;
+ if(!StWindow::isFullScreen()
+ || myDevice == DEVICE_OCULUS) {
+ return;
+ }
+
+ const StRectI_t aRect = StWindow::getPlacement();
+ if(aRect.width() == 1920
+ && aRect.height() == 2205) {
+ myIsHdmiPack = true;
+ } else if(aRect.width() == 1280
+ && aRect.height() == 1470) {
+ myIsHdmiPack = true;
+ }
+}
+
 void StOutDistorted::setFullScreen(const bool theFullScreen) {
+ bool wasFullscreen = StWindow::isFullScreen();
 if(!theFullScreen) {
 myMargins.left = 0;
 myMargins.right = 0;
@@ -705,6 +770,9 @@
 myMargins.bottom = 0;
 }
 StWindow::setFullScreen(theFullScreen);
+ if(!wasFullscreen) {
+ checkHdmiPack();
+ }
 }
 
 void StOutDistorted::stglDraw() {
@@ -732,13 +800,27 @@
 myMargins.bottom = 0;
 }
 
+ StWinSplit aWinSplit = StWinSlave_splitOff;
 if(myIsStereoOn
- && (myDevice == DEVICE_OCULUS || !params.Anamorph->getValue())) {
- StWindow::setAttribute(StWinAttr_SplitCfg, (params.Layout->getValue() == LAYOUT_OVER_UNDER && myDevice != DEVICE_OCULUS)
- ? StWinSlave_splitVertical : StWinSlave_splitHorizontal);
- } else {
- StWindow::setAttribute(StWinAttr_SplitCfg, StWinSlave_splitOff);
+ && (myDevice == DEVICE_OCULUS
+ || params.Layout->getValue() == LAYOUT_SIDE_BY_SIDE
+ || params.Layout->getValue() == LAYOUT_OVER_UNDER)) {
+ aWinSplit = params.Layout->getValue() == LAYOUT_OVER_UNDER && myDevice != DEVICE_OCULUS
+ ? StWinSlave_splitVertical
+ : StWinSlave_splitHorizontal;
+ if(myDevice != DEVICE_OCULUS
+ && params.Layout->getValue() == LAYOUT_OVER_UNDER
+ && myIsHdmiPack) {
+ // detect special HDMI 3D modes
+ const StRectI_t aRect = StWindow::getPlacement();
+ if(aRect.width() == 1920) {
+ aWinSplit = StWinSlave_splitVertHdmi1080;
+ } else if(aRect.width() == 1280) {
+ aWinSplit = StWinSlave_splitVertHdmi720;
+ }
+ }
 }
+ StWindow::setAttribute(StWinAttr_SplitCfg, aWinSplit);
 
 if(!StWindow::stglMakeCurrent(ST_WIN_MASTER)) {
 StWindow::signals.onRedraw(ST_DRAW_MONO);
@@ -769,83 +851,85 @@
 const StPointD_t aCursorPos = StWindow::getMousePos();
 
 #ifdef ST_HAVE_LIBOVR
- if(myOvrHmd != NULL) {
- ovrSizei aRecSizeL = ovrHmd_GetFovTextureSize(myOvrHmd, ovrEye_Left,
- myOvrHmd->DefaultEyeFov[0], 1.0f);
- ovrSizei aRecSizeR = ovrHmd_GetFovTextureSize(myOvrHmd, ovrEye_Right,
- myOvrHmd->DefaultEyeFov[1], 1.0f);
- GLint aFrSizeX = aRecSizeL.w + aRecSizeR.w;
- GLint aFrSizeY = stMax(aRecSizeL.h, aRecSizeR.h);
- //aFrSizeX = aVPBoth.width();
- //aFrSizeY = aVPBoth.height();
- myToReduceGui = aFrSizeX <= 640;
-
- if(!myFrBuffer->initLazy(*myContext, GL_RGBA8, aFrSizeX, aFrSizeY, StWindow::hasDepthBuffer())) {
- myMsgQueue->pushError(stCString("Distorted output - critical error:\nFrame Buffer Object resize failed!"));
- myIsBroken = true;
- return;
- }
+ if(myOvrHmd != NULL
+ && !myIsBroken) {
+ myToReduceGui = true;
+ ovrHmdDesc anHmdDesc = ovr_GetHmdDesc(myOvrHmd);
+ ovrEyeRenderDesc anEyeRenderDesc[2] = {
+ ovr_GetRenderDesc(myOvrHmd, ovrEye_Left, anHmdDesc.DefaultEyeFov[0]),
+ ovr_GetRenderDesc(myOvrHmd, ovrEye_Right, anHmdDesc.DefaultEyeFov[1])
+ };
+ ovrViewScaleDesc aViewScaleDesc;
+ aViewScaleDesc.HmdSpaceToWorldScaleInMeters = 1.0f;
+ aViewScaleDesc.HmdToEyeViewOffset[0] = anEyeRenderDesc[0].HmdToEyeViewOffset;
+ aViewScaleDesc.HmdToEyeViewOffset[1] = anEyeRenderDesc[1].HmdToEyeViewOffset;
 
 const StGLBoxPx aViewPortL = {{ 0, 0,
- myFrBuffer->getVPSizeX() / 2, myFrBuffer->getVPSizeY() }};
- const StGLBoxPx aViewPortR = {{ (myFrBuffer->getVPSizeX() + 1) / 2, 0,
- myFrBuffer->getVPSizeX() / 2, myFrBuffer->getVPSizeY() }};
-
- ovrPosef anOvrHeadPose[2] = {};
- ovrGLTexture anOvrTextures[2] = {};
-
- ovrHmd_BeginFrame(myOvrHmd, 0);
- anOvrHeadPose[ovrEye_Left] = ovrHmd_GetHmdPosePerEye(myOvrHmd, ovrEye_Left);
- anOvrHeadPose[ovrEye_Right] = ovrHmd_GetHmdPosePerEye(myOvrHmd, ovrEye_Right);
+ myOvrSizeX, myOvrSizeY }};
+ const StGLBoxPx aViewPortR = {{ myOvrSizeX, 0,
+ myOvrSizeX, myOvrSizeY }};
+
+ ovrLayerEyeFov aLayerFov;
+ aLayerFov.Header.Type = ovrLayerType_EyeFov;
+ aLayerFov.Header.Flags = ovrLayerFlag_TextureOriginAtBottomLeft;
+ aLayerFov.ColorTexture[0] = myOvrSwapTexture;
+ aLayerFov.ColorTexture[1] = NULL;
+ aLayerFov.Viewport[0].Pos.x = aViewPortL.x();
+ aLayerFov.Viewport[0].Pos.y = aViewPortL.y();
+ aLayerFov.Viewport[0].Size.w= aViewPortL.width();
+ aLayerFov.Viewport[0].Size.h= aViewPortL.height();
+ aLayerFov.Viewport[1].Pos.x = aViewPortR.x();
+ aLayerFov.Viewport[1].Pos.y = aViewPortR.y();
+ aLayerFov.Viewport[1].Size.w= aViewPortR.width();
+ aLayerFov.Viewport[1].Size.h= aViewPortR.height();
+ aLayerFov.Fov[0] = anHmdDesc.DefaultEyeFov[0];
+ aLayerFov.Fov[1] = anHmdDesc.DefaultEyeFov[1];
+ aLayerFov.SensorSampleTime = ovr_GetTimeInSeconds();
+ const double aPredictedTime = ovr_GetPredictedDisplayTime(myOvrHmd, 0);
+ ovrTrackingState anHmdState = ovr_GetTrackingState(myOvrHmd, aPredictedTime, ovrTrue);
+ ovr_CalcEyePoses(anHmdState.HeadPose.ThePose, aViewScaleDesc.HmdToEyeViewOffset, aLayerFov.RenderPose);
+ myOvrOrient = StQuaternion<double>((double )aLayerFov.RenderPose[0].Orientation.x,
+ (double )aLayerFov.RenderPose[0].Orientation.y,
+ (double )aLayerFov.RenderPose[0].Orientation.z,
+ (double )aLayerFov.RenderPose[0].Orientation.w);
 
 // draw Left View into virtual frame buffer
 myContext->stglResizeViewport(aViewPortL);
 myContext->stglSetScissorRect(aViewPortL, false);
- myFrBuffer->bindBuffer(*myContext);
- StWindow::signals.onRedraw(ST_DRAW_LEFT);
- stglDrawCursor(aCursorPos, ST_DRAW_LEFT);
- myFrBuffer->unbindBuffer(*myContext);
+ myContext->stglBindFramebuffer(myOvrSwapFbo[myOvrSwapTexture->CurrentIndex]);
+ StWindow::signals.onRedraw(ST_DRAW_LEFT);
+ stglDrawCursor(aCursorPos, ST_DRAW_LEFT);
 
 // draw Right View into virtual frame buffer
 myContext->stglResizeViewport(aViewPortR);
 myContext->stglSetScissorRect(aViewPortR, false);
- myFrBuffer->bindBuffer(*myContext);
- StWindow::signals.onRedraw(ST_DRAW_RIGHT);
- stglDrawCursor(aCursorPos, ST_DRAW_RIGHT);
- myFrBuffer->unbindBuffer(*myContext);
+ StWindow::signals.onRedraw(ST_DRAW_RIGHT);
+ stglDrawCursor(aCursorPos, ST_DRAW_RIGHT);
+ myContext->stglBindFramebuffer(StGLFrameBuffer::NO_FRAMEBUFFER);
+
+ ovrLayerHeader* aLayers = &aLayerFov.Header;
+ ovrResult anOvrRes = ovr_SubmitFrame(myOvrHmd, 0, &aViewScaleDesc, &aLayers, 1);
+ myOvrSwapTexture->CurrentIndex = myOvrSwapTexture->CurrentIndex == 0 ? 1 : 0;
+ if(!OVR_SUCCESS(anOvrRes)) {
+ myMsgQueue->pushError(stCString("StOutDistorted, Failed to submit swap texture!"));
+ myIsBroken = true;
+ }
 
 myContext->stglResizeViewport(aVPBoth);
 myContext->stglResetScissorRect();
 myContext->core20fwd->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
- anOvrTextures[0].OGL.Header.API = ovrRenderAPI_OpenGL;
- anOvrTextures[0].OGL.Header.TextureSize.w = myFrBuffer->getSizeX();
- anOvrTextures[0].OGL.Header.TextureSize.h = myFrBuffer->getSizeY();
- anOvrTextures[0].OGL.Header.RenderViewport.Pos.x = aViewPortL.x();
- anOvrTextures[0].OGL.Header.RenderViewport.Pos.y = aViewPortL.y();
- anOvrTextures[0].OGL.Header.RenderViewport.Size.w = aViewPortL.width();
- anOvrTextures[0].OGL.Header.RenderViewport.Size.h = aViewPortL.height();
- anOvrTextures[0].OGL.TexId = myFrBuffer->getTextureColor()->getTextureId();
-
- anOvrTextures[1].OGL.Header.API = ovrRenderAPI_OpenGL;
- anOvrTextures[1].OGL.Header.TextureSize.w = myFrBuffer->getSizeX();
- anOvrTextures[1].OGL.Header.TextureSize.h = myFrBuffer->getSizeY();
- anOvrTextures[1].OGL.Header.RenderViewport.Pos.x = aViewPortR.x();
- anOvrTextures[1].OGL.Header.RenderViewport.Pos.y = aViewPortR.y();
- anOvrTextures[1].OGL.Header.RenderViewport.Size.w = aViewPortR.width();
- anOvrTextures[1].OGL.Header.RenderViewport.Size.h = aViewPortR.height();
- anOvrTextures[1].OGL.TexId = myFrBuffer->getTextureColor()->getTextureId();
-
- ovrHmd_EndFrame(myOvrHmd, anOvrHeadPose, (ovrTexture* )anOvrTextures);
-
- ovrHSWDisplayState aWarnDispState;
- ovrHmd_GetHSWDisplayState(myOvrHmd, &aWarnDispState);
- if(aWarnDispState.Displayed) {
- ovrHmd_DismissHSWDisplay(myOvrHmd);
- }
+ myContext->stglBindFramebufferRead(myOvrMirrorFbo);
+ myContext->stglBindFramebufferDraw(StGLFrameBuffer::NO_FRAMEBUFFER);
+ GLint aSrcSizeX = myOvrMirrorTexture->OGL.Header.TextureSize.w;
+ GLint aSrcSizeY = myOvrMirrorTexture->OGL.Header.TextureSize.h;
+ myContext->arbFbo->glBlitFramebuffer(0, aSrcSizeY, aSrcSizeX, 0,
+ 0, 0, aVPBoth.width(), aVPBoth.height(),
+ GL_COLOR_BUFFER_BIT, GL_NEAREST);
+ myContext->stglBindFramebufferRead(StGLFrameBuffer::NO_FRAMEBUFFER);
 
 myFPSControl.sleepToTarget(); // decrease FPS to target by thread sleeps
- //StWindow::stglSwap(ST_WIN_ALL);
+ StWindow::stglSwap(ST_WIN_ALL);
 ++myFPSControl;
 return;
 }
@@ -853,22 +937,24 @@
 
 StGLBoxPx aViewPortL = aVPMaster;
 StGLBoxPx aViewPortR = aVPSlave;
- if(params.Anamorph->getValue()
- && myDevice != DEVICE_OCULUS) {
+ if(myDevice != DEVICE_OCULUS) {
 switch(params.Layout->getValue()) {
- case LAYOUT_OVER_UNDER: {
- aViewPortL.height() /= 2;
- aViewPortR.height() = aViewPortL.height();
- aViewPortR.y() += aViewPortL.height();
+ case LAYOUT_OVER_UNDER_ANAMORPH: {
+ aViewPortR.height() /= 2;
+ aViewPortL.height() = aViewPortR.height();
+ aViewPortL.y() += aViewPortR.height();
 break;
 }
- default:
- case LAYOUT_SIDE_BY_SIDE: {
+ case LAYOUT_SIDE_BY_SIDE_ANAMORPH: {
 aViewPortL.width() /= 2;
 aViewPortR.width() = aViewPortL.width();
 aViewPortR.x() += aViewPortL.width();
 break;
 }
+ case LAYOUT_SIDE_BY_SIDE:
+ case LAYOUT_OVER_UNDER: {
+ break;
+ }
 }
 }

sview-15_10.tar.gz/StOutDistorted/StOutDistorted.h -> sview-15_11.tar.gz/StOutDistorted/StOutDistorted.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutDistorted, class providing stereoscopic output in anamorph side by side format using StCore toolkit.
 * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutDual library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutDual library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutDistorted_h_
@@ -29,8 +20,9 @@
 class StGLFrameBuffer;
 class StGLTexture;
 
-struct ovrHmdDesc_;
-typedef const ovrHmdDesc_* ovrHmd;
+typedef struct ovrHmdStruct* ovrSession;
+typedef union ovrGLTexture_s ovrGLTexture;
+typedef struct ovrSwapTextureSet_ ovrSwapTextureSet;
 
 /**
 * This class implements stereoscopic rendering on displays
@@ -124,6 +116,16 @@
 */
 ST_CPPEXPORT virtual void showCursor(const bool theToShow);
 
+ /**
+ * Return true if device has orientation sensor.
+ */
+ ST_CPPEXPORT virtual bool hasOrientationSensor() const;
+
+ /**
+ * Get head orientation.
+ */
+ ST_CPPEXPORT virtual StQuaternion<double> getDeviceOrientation() const;
+
 ST_CPPEXPORT virtual GLfloat getLensDist() const;
 
 /**
@@ -134,6 +136,11 @@
 private:
 
 /**
+ * Detect frame pack HMDI mode.
+ */
+ ST_LOCAL void checkHdmiPack();
+
+ /**
 * Release GL resources before window closing.
 */
 ST_LOCAL void releaseResources();
@@ -160,14 +167,15 @@
 };
 
 enum Layout {
- LAYOUT_SIDE_BY_SIDE = 0, //!< anamorph side by side
- LAYOUT_OVER_UNDER = 1, //!< anamorph over under
+ LAYOUT_SIDE_BY_SIDE_ANAMORPH = 0, //!< anamorph side by side
+ LAYOUT_OVER_UNDER_ANAMORPH = 1, //!< anamorph over under
+ LAYOUT_SIDE_BY_SIDE = 2, //!< full-size side by side
+ LAYOUT_OVER_UNDER = 3, //!< full-size over under
 };
 
 struct {
 
 StHandle<StInt32Param> Layout; //!< pair layout
- StHandle<StBoolParam> Anamorph; //!< anamorph filter
 StHandle<StBoolParam> MonoClone;//!< display mono in stereo
 
 } params;
@@ -195,13 +203,23 @@
 
 StMarginsI myBarMargins; //!< GUI margins
 
- ovrHmd myOvrHmd;
+ ovrSession myOvrHmd;
+ int myOvrSizeX;
+ int myOvrSizeY;
+ StQuaternion<double> myOvrOrient;
+#ifdef ST_HAVE_LIBOVR
+ ovrSwapTextureSet* myOvrSwapTexture;
+ GLuint myOvrSwapFbo[2];
+ ovrGLTexture* myOvrMirrorTexture;
+ GLuint myOvrMirrorFbo;
+#endif
 
 bool myToReduceGui; //!< scale down GUI
 bool myToShowCursor; //!< cursor visibility flag
 bool myToCompressMem; //!< reduce memory usage
 bool myIsBroken; //!< special flag for broke state - when FBO can not be allocated
 bool myIsStereoOn;
+ bool myIsHdmiPack; //!< "frame packed" mode in HDMI 1.4a
 
 };

sview-15_10.tar.gz/StOutDistorted/lang/chinese/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/chinese/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/czech/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/czech/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/english/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/english/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/french/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/french/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/german/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/german/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/korean/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/korean/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDistorted/lang/russian/StOutDistorted.lng -> sview-15_11.tar.gz/StOutDistorted/lang/russian/StOutDistorted.lng Changed

sview-15_10.tar.gz/StOutDual/StOutDual.cbp -> sview-15_11.tar.gz/StOutDual/StOutDual.cbp Changed

@@ -6,33 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStOutDual" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StOutDual" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -64,11 +37,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StOutDual" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -252,8 +225,7 @@
 			<Option compilerVar="WINDRES" />
 			<Option target="WIN_vc_x86" />
 			<Option target="WIN_vc_AMD64" />
-			<Option target="WIN_gcc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 		</Unit>
 		<Unit filename="lang/chinese/language.lng">
 			<Option target="&lt;{~None~}&gt;" />

sview-15_10.tar.gz/StOutDual/StOutDual.cpp -> sview-15_11.tar.gz/StOutDual/StOutDual.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutDual, class providing stereoscopic output for Dual Input hardware using StCore toolkit.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutDual library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutDual library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutDual.h"
@@ -292,7 +283,9 @@
 }
 
 void StOutDual::beforeClose() {
- mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ if(isMovable() && myWasUsed) {
+ mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ }
 mySettings->saveParam(ST_SETTING_SLAVE_ID, params.SlaveMonId);
 mySettings->saveParam(ST_SETTING_MONOCLONE, params.MonoClone);
 mySettings->saveInt32(ST_SETTING_DEVICE_ID, myDevice);

sview-15_10.tar.gz/StOutDual/StOutDual.h -> sview-15_11.tar.gz/StOutDual/StOutDual.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutDual, class providing stereoscopic output for Dual Input hardware using StCore toolkit.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutDual library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutDual library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutDual_h_

sview-15_10.tar.gz/StOutDual/lang/chinese/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/chinese/StOutDual.lng Changed

sview-15_10.tar.gz/StOutDual/lang/czech/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/czech/StOutDual.lng Changed

sview-15_10.tar.gz/StOutDual/lang/english/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/english/StOutDual.lng Changed

sview-15_10.tar.gz/StOutDual/lang/french/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/french/StOutDual.lng Changed

sview-15_10.tar.gz/StOutDual/lang/german/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/german/StOutDual.lng Changed

sview-15_10.tar.gz/StOutDual/lang/korean/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/korean/StOutDual.lng Changed

sview-15_10.tar.gz/StOutDual/lang/russian/StOutDual.lng -> sview-15_11.tar.gz/StOutDual/lang/russian/StOutDual.lng Changed

sview-15_10.tar.gz/StOutIZ3D/StOutIZ3D.cbp -> sview-15_11.tar.gz/StOutIZ3D/StOutIZ3D.cbp Changed

@@ -6,33 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStOutIZ3D" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StOutIZ3D" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -64,11 +37,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StOutIZ3D" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -257,8 +230,7 @@
 			<Option compilerVar="WINDRES" />
 			<Option target="WIN_vc_x86" />
 			<Option target="WIN_vc_AMD64" />
-			<Option target="WIN_gcc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 		</Unit>
 		<Unit filename="StOutIZ3DShaders.cpp" />
 		<Unit filename="StOutIZ3DShaders.h" />

sview-15_10.tar.gz/StOutIZ3D/StOutIZ3D.cpp -> sview-15_11.tar.gz/StOutIZ3D/StOutIZ3D.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutInterlace, class providing stereoscopic output for iZ3D monitors using StCore toolkit.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutIZ3D.h"
@@ -194,7 +185,9 @@
 }
 
 void StOutIZ3D::beforeClose() {
- mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ if(isMovable() && myWasUsed) {
+ mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ }
 mySettings->saveParam(ST_SETTING_TABLE, params.Glasses);
 mySettings->flush();
 }

sview-15_10.tar.gz/StOutIZ3D/StOutIZ3D.h -> sview-15_11.tar.gz/StOutIZ3D/StOutIZ3D.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutInterlace, class providing stereoscopic output for iZ3D monitors using StCore toolkit.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutIZ3D_h_

sview-15_10.tar.gz/StOutIZ3D/StOutIZ3DShaders.cpp -> sview-15_11.tar.gz/StOutIZ3D/StOutIZ3DShaders.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutInterlace, class providing stereoscopic output for iZ3D monitors using StCore toolkit.
 * Copyright © 2009-2012 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutIZ3DShaders.h"

sview-15_10.tar.gz/StOutIZ3D/StOutIZ3DShaders.h -> sview-15_11.tar.gz/StOutIZ3D/StOutIZ3DShaders.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutInterlace, class providing stereoscopic output for iZ3D monitors using StCore toolkit.
 * Copyright © 2009-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutIZ3DShaders_h_

sview-15_10.tar.gz/StOutIZ3D/lang/chinese/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/chinese/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/lang/czech/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/czech/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/lang/english/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/english/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/lang/french/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/french/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/lang/german/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/german/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/lang/korean/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/korean/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/lang/russian/StOutIZ3D.lng -> sview-15_11.tar.gz/StOutIZ3D/lang/russian/StOutIZ3D.lng Changed

sview-15_10.tar.gz/StOutIZ3D/shaders/fIZ3DBackClassic.shf -> sview-15_11.tar.gz/StOutIZ3D/shaders/fIZ3DBackClassic.shf Changed

@@ -3,19 +3,9 @@
 * Copyright © 2007-2008 iZ3D LLC
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 // it is always better to store variables in vectors

sview-15_10.tar.gz/StOutIZ3D/shaders/fIZ3DBackTable.shf -> sview-15_11.tar.gz/StOutIZ3D/shaders/fIZ3DBackTable.shf Changed

@@ -3,19 +3,9 @@
 * Copyright © 2007-2009 iZ3D LLC
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform sampler2D texL, texR, textT;

sview-15_10.tar.gz/StOutIZ3D/shaders/fIZ3DFrontClassic.shf -> sview-15_11.tar.gz/StOutIZ3D/shaders/fIZ3DFrontClassic.shf Changed

@@ -3,19 +3,9 @@
 * Copyright © 2007-2008 iZ3D LLC
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 vec4 vecOne = vec4( 1.0, 1.0, 1.0, 1.0);

sview-15_10.tar.gz/StOutIZ3D/shaders/fIZ3DFrontTable.shf -> sview-15_11.tar.gz/StOutIZ3D/shaders/fIZ3DFrontTable.shf Changed

@@ -3,19 +3,9 @@
 * Copyright © 2007-2009 iZ3D LLC
 * Copyright © 2007-2010 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutIZ3D library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutIZ3D library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform sampler2D texL, texR, textT;

sview-15_10.tar.gz/StOutIZ3D/shaders/vIZ3D.shv -> sview-15_11.tar.gz/StOutIZ3D/shaders/vIZ3D.shv Changed

sview-15_10.tar.gz/StOutInterlace/StOutInterlace.cbp -> sview-15_11.tar.gz/StOutInterlace/StOutInterlace.cbp Changed

@@ -6,33 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStOutInterlace" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Version" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StOutInterlace" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -64,11 +37,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StOutInterlace" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -252,8 +225,7 @@
 			<Option compilerVar="WINDRES" />
 			<Option target="WIN_vc_x86" />
 			<Option target="WIN_vc_AMD64" />
-			<Option target="WIN_gcc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 		</Unit>
 		<Unit filename="lang/chinese/language.lng">
 			<Option target="&lt;{~None~}&gt;" />

sview-15_10.tar.gz/StOutInterlace/StOutInterlace.cpp -> sview-15_11.tar.gz/StOutInterlace/StOutInterlace.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutInterlace, class providing stereoscopic output in row interlaced format using StCore toolkit.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutInterlace library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutInterlace library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutInterlace.h"
@@ -377,7 +368,9 @@
 }
 
 void StOutInterlace::beforeClose() {
- mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ if(isMovable() && myWasUsed) {
+ mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ }
 mySettings->saveParam(ST_SETTING_BIND_MONITOR, params.BindToMon);
 mySettings->saveParam(ST_SETTING_REVERSE, params.ToReverse);
 mySettings->saveInt32(ST_SETTING_DEVICE_ID, myDevice);

sview-15_10.tar.gz/StOutInterlace/StOutInterlace.h -> sview-15_11.tar.gz/StOutInterlace/StOutInterlace.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutInterlace, class providing stereoscopic output in row interlaced format using StCore toolkit.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutInterlace library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutInterlace library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutInterlace_h_

sview-15_10.tar.gz/StOutInterlace/lang/chinese/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/chinese/StOutInterlace.lng Changed

sview-15_10.tar.gz/StOutInterlace/lang/czech/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/czech/StOutInterlace.lng Changed

sview-15_10.tar.gz/StOutInterlace/lang/english/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/english/StOutInterlace.lng Changed

sview-15_10.tar.gz/StOutInterlace/lang/french/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/french/StOutInterlace.lng Changed

@@ -1,16 +1,16 @@
 # French translation file for StOutInterlace library
 # @author gramoun for Kirill Gavrilov
 --------
-1000="Lignes entrelacées"
-1001="Ecrans entrelacés par lignes: Zalman, Hyundai,..."
-1002="Colonnes entrelacées"
-1003="Ecrans entrelacés par colonnes"
-1006="DLP TV (échiquier)"
-1007="DLP TV (échiquier)"
-1008="Interlaced ED"
-1009="EDimensional en mode entrelacé"
-1102="Inverser l'ordre"
-1103="Lier à écran supporté"
-2000="sView - Interlaced Output module"
-2001="version"
-2002="© {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}\n\nThis library is distributed under LGPL3.0"
+1000=Lignes entrelacées
+1001=Ecrans entrelacés par lignes: Zalman, Hyundai,...
+1002=Colonnes entrelacées
+1003=Ecrans entrelacés par colonnes
+1006=DLP TV (échiquier)
+1007=DLP TV (échiquier)
+1008=Interlaced ED
+1009=EDimensional en mode entrelacé
+1102=Inverser l'ordre
+1103=Lier à écran supporté
+2000=sView - Interlaced Output module
+2001=version
+2002=© {0} Kirill Gavrilov <{1}>\nSite Officiel: {2}

sview-15_10.tar.gz/StOutInterlace/lang/german/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/german/StOutInterlace.lng Changed

@@ -1,16 +1,16 @@
 # German translation file for StOutInterlace library
 # @author Kirill Gavrilov
 --------
-1000="Horizontal Interlaced"
-1001="Row interlaced displays: Zalman, Hyundai,..."
-1002="Vertikal Interlaced"
-1003="Column interlaced displays"
-1006="DLP TV (chessboard)"
-1007="DLP TV (chessboard)"
-1008="Interlaced ED"
-1009="EDimensional in interlaced mode"
-1102="Umgekehrte Reihenfolge"
-1103="Bind to supported monitor"
-2000="sView - Interlaced Ausgangsmodul"
-2001="Version"
-?2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
+1000=Horizontal Interlaced
+1001=Row interlaced displays: Zalman, Hyundai,...
+1002=Vertikal Interlaced
+1003=Column interlaced displays
+1006=DLP TV (chessboard)
+1007=DLP TV (chessboard)
+1008=Interlaced ED
+1009=EDimensional in interlaced mode
+1102=Umgekehrte Reihenfolge
+1103=Bind to supported monitor
+2000=sView - Interlaced Ausgangsmodul
+2001=Version
+?2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}

sview-15_10.tar.gz/StOutInterlace/lang/korean/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/korean/StOutInterlace.lng Changed

@@ -1,16 +1,16 @@
 # English translation file for StOutInterlace library
 # @author Kirill Gavrilov
 --------
-?1000="Row Interlaced"
-?1001="Row interlaced displays: Zalman, Hyundai,..."
-?1002="Column Interlaced"
-?1003="Column interlaced displays"
-?1006="DLP TV (chessboard)"
-?1007="DLP TV (chessboard)"
-?1008="Interlaced ED"
-?1009="EDimensional in interlaced mode"
-?1102="Reverse Order"
-?1103="Bind to supported monitor"
-?2000="sView - Interlaced Output module"
-?2001="version"
-?2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
+?1000=Row Interlaced
+?1001=Row interlaced displays: Zalman, Hyundai,...
+?1002=Column Interlaced
+?1003=Column interlaced displays
+?1006=DLP TV (chessboard)
+?1007=DLP TV (chessboard)
+?1008=Interlaced ED
+?1009=EDimensional in interlaced mode
+?1102=Reverse Order
+?1103=Bind to supported monitor
+?2000=sView - Interlaced Output module
+?2001=version
+?2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}

sview-15_10.tar.gz/StOutInterlace/lang/russian/StOutInterlace.lng -> sview-15_11.tar.gz/StOutInterlace/lang/russian/StOutInterlace.lng Changed

@@ -1,16 +1,16 @@
 # Russian translation file for StOutInterlace library
 # @author Kirill Gavrilov
 --------
-1000="Чересстрочный вывод"
-1001="Чересстрочные мониторы: Zalman, Hyundai,..."
-1002="Column Interlaced"
-1003="Column interlaced displays"
-1006="DLP ТВ (шахматная доска)"
-1007="DLP ТВ (шахматная доска)"
-1008="Чересстрочный ED"
-1009="EDimensional в чересстрочном режиме"
-1102="Реверсировать порядок"
-1103="Bind to supported monitor"
-2000="sView - модуль Чересстрочного стереовывода"
-2001="версия"
-2002="© {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}\n\nБиблиотека распространяется на условиях LGPL3.0"
+1000=Чересстрочный вывод
+1001=Чересстрочные мониторы: Zalman, Hyundai,...
+1002=Column Interlaced
+1003=Column interlaced displays
+1006=DLP ТВ (шахматная доска)
+1007=DLP ТВ (шахматная доска)
+1008=Чересстрочный ED
+1009=EDimensional в чересстрочном режиме
+1102=Реверсировать порядок
+1103=Bind to supported monitor
+2000=sView - модуль Чересстрочного стереовывода
+2001=версия
+2002=© {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}

sview-15_10.tar.gz/StOutInterlace/shaders/fEDinterlace.shf -> sview-15_11.tar.gz/StOutInterlace/shaders/fEDinterlace.shf Changed

@@ -2,19 +2,9 @@
 * EDimensional interlace activation fragment shader.
 * Copyright © 2009 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutInterlace library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutInterlace library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform int vpSizeY;

sview-15_10.tar.gz/StOutInterlace/shaders/fEDoff.shf -> sview-15_11.tar.gz/StOutInterlace/shaders/fEDoff.shf Changed

@@ -2,19 +2,9 @@
 * EDimensional disactivation fragment shader.
 * Copyright © 2009 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutInterlace library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutInterlace library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 uniform int vpSizeY;

sview-15_10.tar.gz/StOutInterlace/shaders/vED.shv -> sview-15_11.tar.gz/StOutInterlace/shaders/vED.shv Changed

sview-15_10.tar.gz/StOutPageFlip/StDXAqbsControl.cpp -> sview-15_11.tar.gz/StOutPageFlip/StDXAqbsControl.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if(defined(_WIN32) || defined(__WIN32__))

sview-15_10.tar.gz/StOutPageFlip/StDXAqbsControl.h -> sview-15_11.tar.gz/StOutPageFlip/StDXAqbsControl.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StDXAqbsControl_h_

sview-15_10.tar.gz/StOutPageFlip/StDXInfo.h -> sview-15_11.tar.gz/StOutPageFlip/StDXInfo.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StDXInfo_h_

sview-15_10.tar.gz/StOutPageFlip/StDXManager.cpp -> sview-15_11.tar.gz/StOutPageFlip/StDXManager.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifdef _WIN32

sview-15_10.tar.gz/StOutPageFlip/StDXManager.h -> sview-15_11.tar.gz/StOutPageFlip/StDXManager.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StDXManager_h_

sview-15_10.tar.gz/StOutPageFlip/StDXNVSurface.cpp -> sview-15_11.tar.gz/StOutPageFlip/StDXNVSurface.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if defined(_WIN32)

sview-15_10.tar.gz/StOutPageFlip/StDXNVSurface.h -> sview-15_11.tar.gz/StOutPageFlip/StDXNVSurface.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StDXNVSurface_h_

sview-15_10.tar.gz/StOutPageFlip/StDXNVWindow.cpp -> sview-15_11.tar.gz/StOutPageFlip/StDXNVWindow.cpp Changed

@@ -1,19 +1,10 @@
 /**
- * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifdef _WIN32
@@ -50,7 +41,10 @@
 myEventQuit (false),
 myEventShow (false),
 myEventHide (false),
- myEventUpdate(false) {
+ myEventUpdate(false),
+ myEventCursorShow(false),
+ myEventCursorHide(false),
+ myToHideCursor(false) {
 stMemZero(myMouseState, sizeof(myMouseState));
 stMemZero(&myWinMsg, sizeof(myWinMsg));
 stMemZero(myKeysMap, sizeof(myKeysMap));
@@ -194,6 +188,19 @@
 return true;
 }
 
+void StDXNVWindow::showCursor(bool theToShow) {
+ if(myToHideCursor != theToShow) {
+ return;
+ }
+
+ if(theToShow) {
+ myEventCursorShow.set();
+ } else {
+ myEventCursorHide.set();
+ }
+ myToHideCursor = !theToShow;
+}
+
 void StDXNVWindow::dxShow() {
 POINT aCursorPos = {};
 ::GetCursorPos(&aCursorPos); // backup cursor position
@@ -364,17 +371,22 @@
 StDXMsg_Show,
 StDXMsg_Hide,
 StDXMsg_Update,
- StDXMsg_WINDOW
+ StDXMsg_CursorShow,
+ StDXMsg_CursorHide,
+ StDXMsg_WINDOW,
+ StDXMsg_NB = StDXMsg_WINDOW
 };
- HANDLE aWaitEvents[4] = {};
- aWaitEvents[StDXMsg_Quit] = myEventQuit .getHandle();
- aWaitEvents[StDXMsg_Show] = myEventShow .getHandle();
- aWaitEvents[StDXMsg_Hide] = myEventHide .getHandle();
- aWaitEvents[StDXMsg_Update] = myEventUpdate.getHandle();
+ HANDLE aWaitEvents[StDXMsg_NB] = {};
+ aWaitEvents[StDXMsg_Quit] = myEventQuit .getHandle();
+ aWaitEvents[StDXMsg_Show] = myEventShow .getHandle();
+ aWaitEvents[StDXMsg_Hide] = myEventHide .getHandle();
+ aWaitEvents[StDXMsg_Update] = myEventUpdate.getHandle();
+ aWaitEvents[StDXMsg_CursorShow] = myEventCursorShow.getHandle();
+ aWaitEvents[StDXMsg_CursorHide] = myEventCursorHide.getHandle();
 
 myEventReady.set();
 for(;;) {
- switch(::MsgWaitForMultipleObjects(4, aWaitEvents, FALSE, INFINITE, QS_ALLINPUT)) {
+ switch(::MsgWaitForMultipleObjects(StDXMsg_NB, aWaitEvents, FALSE, INFINITE, QS_ALLINPUT)) {
 case WAIT_OBJECT_0 + StDXMsg_Quit: {
 ST_DEBUG_LOG_AT("releaseDXWindow() [message thread]");
 if(myIsThreadedDx) {
@@ -412,6 +424,16 @@
 }
 break;
 }
+ case WAIT_OBJECT_0 + StDXMsg_CursorShow: {
+ ::ShowCursor(TRUE);
+ myEventCursorShow.reset();
+ break;
+ }
+ case WAIT_OBJECT_0 + StDXMsg_CursorHide: {
+ ::ShowCursor(FALSE);
+ myEventCursorHide.reset();
+ break;
+ }
 case WAIT_OBJECT_0 + StDXMsg_WINDOW: {
 // a windows message has arrived
 peekMessages();

sview-15_10.tar.gz/StOutPageFlip/StDXNVWindow.h -> sview-15_11.tar.gz/StOutPageFlip/StDXNVWindow.h Changed

@@ -1,19 +1,10 @@
 /**
- * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifdef _WIN32
@@ -53,6 +44,11 @@
 ~StDXNVWindow();
 
 /**
+ * Post message to hide the cursor.
+ */
+ void showCursor(bool theToShow);
+
+ /**
 * Specify if WGL <-> D3D interoperation extension should be used.
 */
 bool toUseWglDxInterop() const {
@@ -289,6 +285,9 @@
 StCondition myEventShow;
 StCondition myEventHide;
 StCondition myEventUpdate;
+ StCondition myEventCursorShow; //!< event to show cursor
+ StCondition myEventCursorHide; //!< event to hide cursor
+ bool myToHideCursor;
 
 };

sview-15_10.tar.gz/StOutPageFlip/StGLColoredLine.cpp -> sview-15_11.tar.gz/StOutPageFlip/StGLColoredLine.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2010-2012 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StGLColoredLine.h"

sview-15_10.tar.gz/StOutPageFlip/StGLColoredLine.h -> sview-15_11.tar.gz/StOutPageFlip/StGLColoredLine.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2010-2012 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StGLColoredLine_h_

sview-15_10.tar.gz/StOutPageFlip/StGLControlED.cpp -> sview-15_11.tar.gz/StOutPageFlip/StGLControlED.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2010-2012 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StGLControlED.h"

sview-15_10.tar.gz/StOutPageFlip/StGLControlED.h -> sview-15_11.tar.gz/StOutPageFlip/StGLControlED.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2010-2012 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StGLControlED_h_

sview-15_10.tar.gz/StOutPageFlip/StGLDeviceControl.h -> sview-15_11.tar.gz/StOutPageFlip/StGLDeviceControl.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2010-2012 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StGLDeviceControl_h_

sview-15_10.tar.gz/StOutPageFlip/StOutPageFlip.cbp -> sview-15_11.tar.gz/StOutPageFlip/StOutPageFlip.cbp Changed

@@ -6,39 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/libStOutPageFlip" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-shared" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-fcheck-new" />
-					<Add option="-fno-strict-aliasing" />
-					<Add option="-Wno-comment" />
-					<Add option="-Wno-unknown-pragmas" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="Version" />
-					<Add library="D3D9" />
-					<Add library="nvapi" />
-				</Linker>
-				<ExtraCommands>
-					<Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />
-				</ExtraCommands>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StOutPageFlip" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
@@ -72,11 +39,11 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StOutPageFlip" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -280,9 +247,8 @@
 		<Unit filename="StOutPageFlip.h" />
 		<Unit filename="StOutPageFlip.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StOutPageFlipExt.cpp" />

sview-15_10.tar.gz/StOutPageFlip/StOutPageFlip.cpp -> sview-15_11.tar.gz/StOutPageFlip/StOutPageFlip.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutPageFlip.h"
@@ -582,7 +573,9 @@
 }
 
 void StOutPageFlip::beforeClose() {
- mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ if(isMovable() && myWasUsed) {
+ mySettings->saveInt32Rect(ST_SETTING_WINDOWPOS, StWindow::getWindowedPlacement());
+ }
 mySettings->saveInt32(ST_SETTING_DEVICE_ID, myDevice);
 mySettings->saveParam(ST_SETTING_ADVANCED, params.ToShowExtra);
 if(myWasUsed) {
@@ -797,6 +790,15 @@
 #endif
 }
 
+void StOutPageFlip::showCursor(const bool theToShow) {
+ StWindow::showCursor(theToShow);
+#ifdef _WIN32
+ if(!myOutD3d.DxWindow.isNull()) {
+ myOutD3d.DxWindow->showCursor(theToShow);
+ }
+#endif
+}
+
 bool StOutPageFlip::create() {
 StWindow::show();

sview-15_10.tar.gz/StOutPageFlip/StOutPageFlip.h -> sview-15_11.tar.gz/StOutPageFlip/StOutPageFlip.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutPageFlip_h_
@@ -128,6 +119,12 @@
 */
 ST_CPPEXPORT virtual void stglDraw();
 
+ /**
+ * Show/Hide mouse cursor.
+ * @param theToShow true to show cursor
+ */
+ ST_CPPEXPORT virtual void showCursor(const bool theToShow);
+
 protected:
 
 ST_LOCAL void setupDevice();

sview-15_10.tar.gz/StOutPageFlip/StOutPageFlipExt.cpp -> sview-15_11.tar.gz/StOutPageFlip/StOutPageFlipExt.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StOutPageFlipExt.h"

sview-15_10.tar.gz/StOutPageFlip/StOutPageFlipExt.h -> sview-15_11.tar.gz/StOutPageFlip/StOutPageFlipExt.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2007-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutPageFlipExt_h_

sview-15_10.tar.gz/StOutPageFlip/StOutPageFlipStrings.h -> sview-15_11.tar.gz/StOutPageFlip/StOutPageFlipStrings.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2007-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOutPageFlipStrings_h_

sview-15_10.tar.gz/StOutPageFlip/StQuadBufferCheck.ObjC.mm -> sview-15_11.tar.gz/StOutPageFlip/StQuadBufferCheck.ObjC.mm Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if (defined(__APPLE__))

sview-15_10.tar.gz/StOutPageFlip/StQuadBufferCheck.cpp -> sview-15_11.tar.gz/StOutPageFlip/StQuadBufferCheck.cpp Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #include "StQuadBufferCheck.h"

sview-15_10.tar.gz/StOutPageFlip/StQuadBufferCheck.h -> sview-15_11.tar.gz/StOutPageFlip/StQuadBufferCheck.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StQuadBufferCheck_h_

sview-15_10.tar.gz/StOutPageFlip/StVuzixSDK.h -> sview-15_11.tar.gz/StOutPageFlip/StVuzixSDK.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StOutPageFlip, class providing stereoscopic output for Shutter Glasses displays using StCore toolkit.
 * Copyright © 2009 Kirill Gavrilov <kirill@sview.ru>
 *
- * StOutPageFlip library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StOutPageFlip library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StVuzixSDK_h_

sview-15_10.tar.gz/StOutPageFlip/lang/chinese/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/chinese/StOutPageFlip.lng Changed

@@ -1,25 +1,25 @@
 # Chinese translation file for StOutPageFlip library
 # @author YSC
 --------
-1000="快门眼镜"
-1001="快门眼镜"
-1002="Vuzix HMD"
-1003="Vuzix HMD"
-1102="缓冲类型"
-1103="眼镜控制编码"
-1120="OpenGL 跟踪"
-1122="OpenGL硬件"
-1123="Direct3D (全屏)"
-1124="Direct3D (未获得)"
-1125="Direct3D AMD (全屏)"
-1126="Direct3D AMD (未获得)"
-1127="Direct3D NVIDIA (全屏)"
-1128="Direct3D NVIDIA (失效)"
-1130="无编码"
-1131="蓝线同步"
-1132="白线同步"
-1134="空间自动开/关"
-2000="sView - 快门输出模式"
-2001="版本"
-?2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
-?3001="OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section)."
+1000=快门眼镜
+1001=快门眼镜
+1002=Vuzix HMD
+1003=Vuzix HMD
+1102=缓冲类型
+1103=眼镜控制编码
+1120=OpenGL 跟踪
+1122=OpenGL硬件
+1123=Direct3D (全屏)
+1124=Direct3D (未获得)
+1125=Direct3D AMD (全屏)
+1126=Direct3D AMD (未获得)
+1127=Direct3D NVIDIA (全屏)
+1128=Direct3D NVIDIA (失效)
+1130=无编码
+1131=蓝线同步
+1132=白线同步
+1134=空间自动开/关
+2000=sView - 快门输出模式
+2001=版本
+?2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}
+?3001=OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section).

sview-15_10.tar.gz/StOutPageFlip/lang/czech/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/czech/StOutPageFlip.lng Changed

sview-15_10.tar.gz/StOutPageFlip/lang/english/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/english/StOutPageFlip.lng Changed

@@ -1,25 +1,25 @@
 # English translation file for StOutPageFlip library
 # @author Kirill Gavrilov
 --------
-1000="Shutter glasses"
-1001="Shutter glasses"
-1002="Vuzix HMD"
-1003="Vuzix HMD"
-1102="Quad Buffer type"
-1103="Glasses control codes"
-1120="OpenGL Emulated"
-1122="OpenGL Hardware"
-1123="Direct3D (Fullscreen)"
-1124="Direct3D (Unavailable)"
-1125="Direct3D AMD (Fullscreen)"
-1126="Direct3D AMD (Unavailable)"
-1127="Direct3D NVIDIA (Fullscreen)"
-1128="Direct3D NVIDIA (Disabled)"
-1130="No codes"
-1131="Blue line sync"
-1132="White line sync"
-1134="eDimensional auto on/off"
-2000="sView - PageFlip Output module"
-2001="version"
-2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
-3001="OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section)."
+1000=Shutter glasses
+1001=Shutter glasses
+1002=Vuzix HMD
+1003=Vuzix HMD
+1102=Quad Buffer type
+1103=Glasses control codes
+1120=OpenGL Emulated
+1122=OpenGL Hardware
+1123=Direct3D (Fullscreen)
+1124=Direct3D (Unavailable)
+1125=Direct3D AMD (Fullscreen)
+1126=Direct3D AMD (Unavailable)
+1127=Direct3D NVIDIA (Fullscreen)
+1128=Direct3D NVIDIA (Disabled)
+1130=No codes
+1131=Blue line sync
+1132=White line sync
+1134=eDimensional auto on/off
+2000=sView - PageFlip Output module
+2001=version
+2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}
+3001=OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section).

sview-15_10.tar.gz/StOutPageFlip/lang/french/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/french/StOutPageFlip.lng Changed

@@ -1,25 +1,25 @@
 # French translation file for StOutPageFlip library
 # @author gramoun for Kirill Gavrilov
 --------
-1000="Lunettes Actives"
-1001="Lunettes Actives"
-1002="Vuzix HMD"
-1003="Vuzix HMD"
-1102="Quad Buffer type"
-1103="Codes de controle des lunettes"
-1120="OpenGL Emulé"
-1122="OpenGL Matériel"
-1123="Direct3D (Fullscreen)"
-1124="Direct3D (Unavailable)"
-1125="Direct3D AMD (Fullscreen)"
-1126="Direct3D AMD (Unavailable)"
-1127="Direct3D NVIDIA (Fullscreen)"
-1128="Direct3D NVIDIA (Disabled)"
-1130="Sans"
-1131="Synchro ligne bleue"
-1132="Synchro ligne blanche"
-1134="eDimensional auto Marche/Arrêt"
-2000="sView - PageFlip Output module"
-2001="version"
-2002="© {0} Kirill Gavrilov <{1}>\nOfficiel site: {2}\n\nThis library is distributed under LGPL3.0"
-?3001="OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section)."
+1000=Lunettes Actives
+1001=Lunettes Actives
+1002=Vuzix HMD
+1003=Vuzix HMD
+1102=Quad Buffer type
+1103=Codes de controle des lunettes
+1120=OpenGL Emulé
+1122=OpenGL Matériel
+1123=Direct3D (Fullscreen)
+1124=Direct3D (Unavailable)
+1125=Direct3D AMD (Fullscreen)
+1126=Direct3D AMD (Unavailable)
+1127=Direct3D NVIDIA (Fullscreen)
+1128=Direct3D NVIDIA (Disabled)
+1130=Sans
+1131=Synchro ligne bleue
+1132=Synchro ligne blanche
+1134=eDimensional auto Marche/Arrêt
+2000=sView - PageFlip Output module
+2001=version
+2002=© {0} Kirill Gavrilov <{1}>\nOfficiel site: {2}
+?3001=OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section).

sview-15_10.tar.gz/StOutPageFlip/lang/german/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/german/StOutPageFlip.lng Changed

@@ -1,25 +1,25 @@
 # German translation file for StOutPageFlip library
 # @author Kirill Gavrilov
 --------
-1000="Shutterbrille"
-1001="Shutterbrille"
-1002="Vuzix HMD"
-1003="Vuzix HMD"
-1102="Quad Buffer Typ"
-1103="Brille Kontrollcodes"
-1120="OpenGL emulierte"
-1122="OpenGL hardware"
-1123="Direct3D (Vollbild)"
-1124="Direct3D (nicht verfügbar)"
-1125="Direct3D AMD (Vollbild)"
-1126="Direct3D AMD (nicht verfügbar)"
-1127="Direct3D NVIDIA (Vollbild)"
-1128="Direct3D NVIDIA (behindert)"
-1130="keine Codes"
-1131="blau Linie sync"
-1132="weiß Linie sync"
-1134="eDimensional auto on/off"
-2000="sView - PageFlip Ausgangsmodul"
-2001="Version"
-?2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
-3001="OpenGL Hardware QuadBuffer nicht verfügbar!\n\nSie können eine andere Quad Buffer versuchen\n(einschließlich OpenGL emulierte in extra Sektion)."
+1000=Shutterbrille
+1001=Shutterbrille
+1002=Vuzix HMD
+1003=Vuzix HMD
+1102=Quad Buffer Typ
+1103=Brille Kontrollcodes
+1120=OpenGL emulierte
+1122=OpenGL hardware
+1123=Direct3D (Vollbild)
+1124=Direct3D (nicht verfügbar)
+1125=Direct3D AMD (Vollbild)
+1126=Direct3D AMD (nicht verfügbar)
+1127=Direct3D NVIDIA (Vollbild)
+1128=Direct3D NVIDIA (behindert)
+1130=keine Codes
+1131=blau Linie sync
+1132=weiß Linie sync
+1134=eDimensional auto on/off
+2000=sView - PageFlip Ausgangsmodul
+2001=Version
+?2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}
+3001=OpenGL Hardware QuadBuffer nicht verfügbar!\n\nSie können eine andere Quad Buffer versuchen\n(einschließlich OpenGL emulierte in extra Sektion).

sview-15_10.tar.gz/StOutPageFlip/lang/korean/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/korean/StOutPageFlip.lng Changed

@@ -1,25 +1,25 @@
 # English translation file for StOutPageFlip library
 # @author Kirill Gavrilov
 --------
-?1000="Shutter glasses"
-?1001="Shutter glasses"
-?1002="Vuzix HMD"
-?1003="Vuzix HMD"
-?1102="Quad Buffer type"
-?1103="Glasses control codes"
-?1120="OpenGL Emulated"
-?1122="OpenGL Hardware"
-?1123="Direct3D (Fullscreen)"
-?1124="Direct3D (Unavailable)"
-?1125="Direct3D AMD (Fullscreen)"
-?1126="Direct3D AMD (Unavailable)"
-?1127="Direct3D NVIDIA (Fullscreen)"
-?1128="Direct3D NVIDIA (Disabled)"
-?1130="No codes"
-?1131="Blue line sync"
-?1132="White line sync"
-?1134="eDimensional auto on/off"
-?2000="sView - PageFlip Output module"
-?2001="version"
-?2002="© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}\n\nThis library is distributed under LGPL3.0"
-?3001="OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section)."
+?1000=Shutter glasses
+?1001=Shutter glasses
+?1002=Vuzix HMD
+?1003=Vuzix HMD
+?1102=Quad Buffer type
+?1103=Glasses control codes
+?1120=OpenGL Emulated
+?1122=OpenGL Hardware
+?1123=Direct3D (Fullscreen)
+?1124=Direct3D (Unavailable)
+?1125=Direct3D AMD (Fullscreen)
+?1126=Direct3D AMD (Unavailable)
+?1127=Direct3D NVIDIA (Fullscreen)
+?1128=Direct3D NVIDIA (Disabled)
+?1130=No codes
+?1131=Blue line sync
+?1132=White line sync
+?1134=eDimensional auto on/off
+?2000=sView - PageFlip Output module
+?2001=version
+?2002=© {0} Kirill Gavrilov <{1}>\nOfficial site: {2}
+?3001=OpenGL Hardware QuadBuffer is unavailable!\n\nYou can try another Quad Buffer type\n(including OpenGL emulated in Extra section).

sview-15_10.tar.gz/StOutPageFlip/lang/russian/StOutPageFlip.lng -> sview-15_11.tar.gz/StOutPageFlip/lang/russian/StOutPageFlip.lng Changed

@@ -1,25 +1,25 @@
 # Russian translation file for StOutPageFlip library
 # @author Kirill Gavrilov
 --------
-1000="Затворные очки"
-1001="Затворные очки"
-1002="Vuzix HMD"
-1003="Vuzix HMD"
-1102="Тип Квадробуфера"
-1103="Управление очками"
-1120="OpenGL эмуляция"
-1122="OpenGL аппаратный"
-1123="Direct3D (Fullscreen)"
-1124="Direct3D (Unavailable)"
-1125="Direct3D AMD (Fullscreen)"
-1126="Direct3D AMD (Unavailable)"
-1127="Direct3D NVIDIA (Fullscreen)"
-1128="Direct3D NVIDIA (Disabled)"
-1130="Без контроля"
-1131="Голубая линия"
-1132="Белая линия"
-1134="eDimensional авто вкл/выкл"
-2000="sView - модуль стереовывода для завторных очков"
-2001="версия"
-2002="© {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}\n\nБиблиотека распространяется на условиях LGPL3.0"
-3001="OpenGL Hardware QuadBuffer не доступен!\n\nМожно попробовать другой тип квадробуфера в меню\n(включая эмулированный OpenGL в расширенном режиме)."
+1000=Затворные очки
+1001=Затворные очки
+1002=Vuzix HMD
+1003=Vuzix HMD
+1102=Тип Квадробуфера
+1103=Управление очками
+1120=OpenGL эмуляция
+1122=OpenGL аппаратный
+1123=Direct3D (Fullscreen)
+1124=Direct3D (Unavailable)
+1125=Direct3D AMD (Fullscreen)
+1126=Direct3D AMD (Unavailable)
+1127=Direct3D NVIDIA (Fullscreen)
+1128=Direct3D NVIDIA (Disabled)
+1130=Без контроля
+1131=Голубая линия
+1132=Белая линия
+1134=eDimensional авто вкл/выкл
+2000=sView - модуль стереовывода для завторных очков
+2001=версия
+2002=© {0} Гаврилов Кирилл <{1}>\nОфициальный сайт: {2}
+3001=OpenGL Hardware QuadBuffer не доступен!\n\nМожно попробовать другой тип квадробуфера в меню\n(включая эмулированный OpenGL в расширенном режиме).

sview-15_10.tar.gz/StShared/StAVFrame.cpp -> sview-15_11.tar.gz/StShared/StAVFrame.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -8,6 +8,8 @@
 
 #include <StAV/StAVFrame.h>
 
+#include <StAV/StAVImage.h>
+
 StAVFrame::StAVFrame()
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
 : Frame(av_frame_alloc())
@@ -49,3 +51,53 @@
 thePixFmt = theCodecCtx->pix_fmt;
 #endif
 }
+
+StAVFrameCounter::StAVFrameCounter()
+: myFrame(NULL),
+ myIsProxy(false) {
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ myFrame = av_frame_alloc();
+#endif
+}
+
+StAVFrameCounter::~StAVFrameCounter() {
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ av_frame_free(&myFrame);
+#endif
+}
+
+void StAVFrameCounter::createReference(StHandle<StBufferCounter>& theOther) const {
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ StHandle<StAVFrameCounter> anAvRef = StHandle<StAVFrameCounter>::downcast(theOther);
+ if(anAvRef.isNull()) {
+ anAvRef = new StAVFrameCounter();
+ theOther = anAvRef;
+ }
+
+ av_frame_unref(anAvRef->myFrame);
+ if(myIsProxy) {
+ // just steal the reference
+ av_frame_move_ref(anAvRef->myFrame, myFrame);
+ } else {
+ av_frame_ref(anAvRef->myFrame, myFrame);
+ }
+#else
+ theOther.nullify();
+#endif
+}
+
+void StAVFrameCounter::releaseReference() {
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ av_frame_unref(myFrame);
+#endif
+}
+
+void StAVFrameCounter::moveReferenceFrom(AVFrame* theFrame) {
+ myIsProxy = true;
+#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ av_frame_unref(myFrame);
+ av_frame_move_ref(myFrame, theFrame);
+#else
+ (void )theFrame;
+#endif
+}

sview-15_10.tar.gz/StShared/StAVImage.cpp -> sview-15_11.tar.gz/StShared/StAVImage.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2011-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2011-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -22,24 +22,13 @@
 : myImageFormat(NULL),
 myFormatCtx(NULL),
 myCodecCtx(NULL),
- myCodec(NULL),
- myFrame(NULL) {
+ myCodec(NULL) {
 StAVImage::init();
 myImageFormat = av_find_input_format("image2");
-#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
- myFrame = av_frame_alloc();
-#else
- myFrame = avcodec_alloc_frame();
-#endif
 }
 
 StAVImage::~StAVImage() {
 close();
-#if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
- av_frame_free(&myFrame);
-#else
- av_free(myFrame);
-#endif
 }
 
 int StAVImage::getAVPixelFormat(const StImage& theImage) {
@@ -180,6 +169,12 @@
 }
 
 void StAVImage::close() {
+ myMetadata.clear();
+ closeAvCtx();
+}
+
+void StAVImage::closeAvCtx() {
+ myFrame.reset();
 if(myCodec != NULL && myCodecCtx != NULL) {
 avcodec_close(myCodecCtx); // close VIDEO codec
 }
@@ -208,6 +203,7 @@
 StImage::nullify();
 setState();
 close();
+ myMetadata.clear();
 
 switch(theImageType) {
 case ST_TYPE_PNG:
@@ -221,6 +217,15 @@
 myCodec = avcodec_find_decoder_by_name("mjpeg");
 break;
 }
+ case ST_TYPE_EXR: {
+ myCodec = avcodec_find_decoder_by_name("exr");
+ break;
+ }
+ case ST_TYPE_WEBP:
+ case ST_TYPE_WEBPLL: {
+ myCodec = avcodec_find_decoder_by_name("webp");
+ break;
+ }
 default: {
 break;
 }
@@ -326,9 +331,9 @@
 // decode one frame
 int isFrameFinished = 0;
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0))
- avcodec_decode_video2(myCodecCtx, myFrame, &isFrameFinished, anAvPkt.getAVpkt());
+ avcodec_decode_video2(myCodecCtx, myFrame.Frame, &isFrameFinished, anAvPkt.getAVpkt());
 #else
- avcodec_decode_video(myCodecCtx, myFrame, &isFrameFinished,
+ avcodec_decode_video(myCodecCtx, myFrame.Frame, &isFrameFinished,
 theDataPtr, theDataSize);
 #endif
 
@@ -362,7 +367,7 @@
 
 #ifdef ST_AV_NEWSTEREO
 // currently it is unlikelly... but maybe in future?
- AVFrameSideData* aSideData = av_frame_get_side_data(myFrame, AV_FRAME_DATA_STEREO3D);
+ AVFrameSideData* aSideData = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_STEREO3D);
 if(aSideData != NULL) {
 AVStereo3D* aStereo = (AVStereo3D* )aSideData->data;
 mySrcFormat = stAV::stereo3dAvToSt(aStereo->type);
@@ -374,37 +379,70 @@
 }
 #endif
 
+ // it is unlikely that there would be any metadata from format...
+ // but lets try
+ if(myFormatCtx != NULL) {
+ for(stAV::meta::Tag* aTag = stAV::meta::findTag(myFormatCtx->metadata, "", NULL, stAV::meta::SEARCH_IGNORE_SUFFIX);
+ aTag != NULL;
+ aTag = stAV::meta::findTag(myFormatCtx->metadata, "", aTag, stAV::meta::SEARCH_IGNORE_SUFFIX)) {
+ myMetadata.add(StDictEntry(aTag->key, aTag->value));
+ }
+ for(stAV::meta::Tag* aTag = stAV::meta::findTag(myFormatCtx->streams[0]->metadata, "", NULL, stAV::meta::SEARCH_IGNORE_SUFFIX);
+ aTag != NULL;
+ aTag = stAV::meta::findTag(myFormatCtx->streams[0]->metadata, "", aTag, stAV::meta::SEARCH_IGNORE_SUFFIX)) {
+ myMetadata.add(StDictEntry(aTag->key, aTag->value));
+ }
+ }
+
+ // collect metadata from the frame
+ stAV::meta::Dict* aFrameMetadata = stAV::meta::getFrameMetadata(myFrame.Frame);
+ for(stAV::meta::Tag* aTag = stAV::meta::findTag(aFrameMetadata, "", NULL, stAV::meta::SEARCH_IGNORE_SUFFIX);
+ aTag != NULL;
+ aTag = stAV::meta::findTag(aFrameMetadata, "", aTag, stAV::meta::SEARCH_IGNORE_SUFFIX)) {
+ myMetadata.add(StDictEntry(aTag->key, aTag->value));
+ }
+
 stAV::dimYUV aDimsYUV;
 if(myCodecCtx->pix_fmt == stAV::PIX_FMT::RGB24) {
 setColorModel(StImage::ImgColor_RGB);
- changePlane(0).initWrapper(StImagePlane::ImgRGB, myFrame->data[0],
+ changePlane(0).initWrapper(StImagePlane::ImgRGB, myFrame.getPlane(0),
 myCodecCtx->width, myCodecCtx->height,
- myFrame->linesize[0]);
+ myFrame.getLineSize(0));
 } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::BGR24) {
 setColorModel(StImage::ImgColor_RGB);
- changePlane(0).initWrapper(StImagePlane::ImgBGR, myFrame->data[0],
+ changePlane(0).initWrapper(StImagePlane::ImgBGR, myFrame.getPlane(0),
 myCodecCtx->width, myCodecCtx->height,
- myFrame->linesize[0]);
+ myFrame.getLineSize(0));
 } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::RGBA32) {
 setColorModel(StImage::ImgColor_RGBA);
- changePlane(0).initWrapper(StImagePlane::ImgRGBA, myFrame->data[0],
+ changePlane(0).initWrapper(StImagePlane::ImgRGBA, myFrame.getPlane(0),
 myCodecCtx->width, myCodecCtx->height,
- myFrame->linesize[0]);
+ myFrame.getLineSize(0));
 } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::BGRA32) {
 setColorModel(StImage::ImgColor_RGBA);
- changePlane(0).initWrapper(StImagePlane::ImgBGRA, myFrame->data[0],
+ changePlane(0).initWrapper(StImagePlane::ImgBGRA, myFrame.getPlane(0),
 myCodecCtx->width, myCodecCtx->height,
- myFrame->linesize[0]);
+ myFrame.getLineSize(0));
 } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::GRAY8) {
 setColorModel(StImage::ImgColor_GRAY);
- changePlane(0).initWrapper(StImagePlane::ImgGray, myFrame->data[0],
+ changePlane(0).initWrapper(StImagePlane::ImgGray, myFrame.getPlane(0),
 myCodecCtx->width, myCodecCtx->height,
- myFrame->linesize[0]);
+ myFrame.getLineSize(0));
 } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::GRAY16) {
 setColorModel(StImage::ImgColor_GRAY);
- changePlane(0).initWrapper(StImagePlane::ImgGray16, myFrame->data[0],
+ changePlane(0).initWrapper(StImagePlane::ImgGray16, myFrame.getPlane(0),
 myCodecCtx->width, myCodecCtx->height,
- myFrame->linesize[0]);
+ myFrame.getLineSize(0));
+ } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::RGB48) {
+ setColorModel(StImage::ImgColor_RGB);
+ changePlane(0).initWrapper(StImagePlane::ImgRGB48, myFrame.getPlane(0),
+ myCodecCtx->width, myCodecCtx->height,
+ myFrame.getLineSize(0));
+ } else if(myCodecCtx->pix_fmt == stAV::PIX_FMT::RGBA64) {
+ setColorModel(StImage::ImgColor_RGBA);
+ changePlane(0).initWrapper(StImagePlane::ImgRGBA64, myFrame.getPlane(0),
+ myCodecCtx->width, myCodecCtx->height,
+ myFrame.getLineSize(0));
 } else if(stAV::isFormatYUVPlanar(myCodecCtx, aDimsYUV)) {
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 29, 0))
 if(myCodecCtx->color_range == AVCOL_RANGE_JPEG) {
@@ -424,12 +462,12 @@
 aPlaneFrmt = StImagePlane::ImgGray16;
 }
 
- changePlane(0).initWrapper(aPlaneFrmt, myFrame->data[0],
- size_t(aDimsYUV.widthY), size_t(aDimsYUV.heightY), myFrame->linesize[0]);
- changePlane(1).initWrapper(aPlaneFrmt, myFrame->data[1],
- size_t(aDimsYUV.widthU), size_t(aDimsYUV.heightU), myFrame->linesize[1]);
- changePlane(2).initWrapper(aPlaneFrmt, myFrame->data[2],
- size_t(aDimsYUV.widthV), size_t(aDimsYUV.heightV), myFrame->linesize[2]);
+ changePlane(0).initWrapper(aPlaneFrmt, myFrame.getPlane(0),
+ size_t(aDimsYUV.widthY), size_t(aDimsYUV.heightY), myFrame.getLineSize(0));
+ changePlane(1).initWrapper(aPlaneFrmt, myFrame.getPlane(1),
+ size_t(aDimsYUV.widthU), size_t(aDimsYUV.heightU), myFrame.getLineSize(1));
+ changePlane(2).initWrapper(aPlaneFrmt, myFrame.getPlane(2),
+ size_t(aDimsYUV.widthV), size_t(aDimsYUV.heightV), myFrame.getLineSize(2));
 } else {
 ///ST_DEBUG_LOG("StAVImage, perform conversion from Pixel format '" + avcodec_get_pix_fmt_name(myCodecCtx->pix_fmt) + "' to RGB");
 // initialize software scaler/converter
@@ -453,9 +491,11 @@
 rgbLinesize[0] = (int )changePlane(0).getSizeRowBytes();
 
 sws_scale(pToRgbCtx,
- myFrame->data, myFrame->linesize,
+ myFrame.Frame->data, myFrame.Frame->linesize,
 0, myCodecCtx->height,
 rgbData, rgbLinesize);
+ // reset original data
+ closeAvCtx();
 
 sws_freeContext(pToRgbCtx);
 }
@@ -536,7 +576,7 @@
 anImage.initWrapper(*this);
 } else {
 // convert to compatible pixel format
- PixelFormat aPFrmtTarget = stAV::PIX_FMT::YUVJ422P;
+ PixelFormat aPFrmtTarget = aPFormatAV == stAV::PIX_FMT::YUV420P ? stAV::PIX_FMT::YUVJ420P : stAV::PIX_FMT::YUVJ422P;
 anImage.setColorModel(StImage::ImgColor_YUV);
 anImage.setColorScale(StImage::ImgScale_Mpeg);
 anImage.changePlane(0).initTrash(StImagePlane::ImgGray, getSizeX(), getSizeY(), getAligned(getSizeX()));
@@ -585,15 +625,21 @@
 }
 
 // wrap own data into AVFrame
- fillPointersAV(anImage, myFrame->data, myFrame->linesize);
+ myFrame.Frame->format = myCodecCtx->pix_fmt;
+ myFrame.Frame->width = myCodecCtx->width;
+ myFrame.Frame->height = myCodecCtx->height;
+ fillPointersAV(anImage, myFrame.Frame->data, myFrame.Frame->linesize);
 
 #ifdef ST_AV_NEWSTEREO
- // currently it is unlikelly... but maybe in future?
- AVStereo3DType anAvStereoType = stAV::stereo3dStToAv(theSrcFormat);
+ bool isReversed = false;
+ AVStereo3DType anAvStereoType = stAV::stereo3dStToAv(theSrcFormat, isReversed);
 if(anAvStereoType != (AVStereo3DType )-1) {
- AVStereo3D* aStereo = av_stereo3d_create_side_data(myFrame);
+ AVStereo3D* aStereo = av_stereo3d_create_side_data(myFrame.Frame);
 if(aStereo != NULL) {
 aStereo->type = anAvStereoType;
+ if(isReversed) {
+ aStereo->flags |= AV_STEREO3D_FLAG_INVERT;
+ }
 }
 }
 #endif
@@ -615,14 +661,12 @@
 aPacket.getAVpkt()->size = aBuffSize;
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 2, 100))
 int isGotPacket = 0;
- int anEncSize = avcodec_encode_video2(myCodecCtx, aPacket.getAVpkt(), myFrame, &isGotPacket);
- if(anEncSize == 0 && isGotPacket != 0 && myCodecCtx->coded_frame) {
- myCodecCtx->coded_frame->pts = aPacket.getPts();
- myCodecCtx->coded_frame->key_frame = aPacket.isKeyFrame() ? 1 : 0;
+ int anEncSize = avcodec_encode_video2(myCodecCtx, aPacket.getAVpkt(), myFrame.Frame, &isGotPacket);
+ if(anEncSize == 0 && isGotPacket != 0) {
 anEncSize = aPacket.getSize();
 }
 #else
- int anEncSize = avcodec_encode_video(myCodecCtx, aPacket.changeData(), aPacket.getSize(), myFrame);
+ int anEncSize = avcodec_encode_video(myCodecCtx, aPacket.changeData(), aPacket.getSize(), myFrame.Frame);
 #endif
 if(anEncSize <= 0) {
 setState("AVCodec library, fail to encode the image");

sview-15_10.tar.gz/StShared/StCondition.cpp -> sview-15_11.tar.gz/StShared/StCondition.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -16,7 +16,27 @@
 #endif
 
 #include <StThreads/StCondition.h>
-#include <StThreads/StTimer.h> // for ST_HAVE_MONOTONIC_CLOCK
+#include <StThreads/StTimer.h>
+
+namespace {
+
+#ifndef _WIN32
+ /**
+ * clock_gettime() wrapper.
+ */
+ inline void stGetRealTime(struct timespec& theTime) {
+ #if defined(__APPLE__)
+ struct timeval aTime;
+ gettimeofday(&aTime, NULL);
+ theTime.tv_sec = aTime.tv_sec;
+ theTime.tv_nsec = aTime.tv_usec * 1000;
+ #else
+ clock_gettime(CLOCK_REALTIME, &theTime);
+ #endif
+ }
+#endif
+
+}
 
 StCondition::StCondition()
 #ifdef _WIN32
@@ -93,18 +113,17 @@
 bool isSignalled = true;
 pthread_mutex_lock(&myMutex);
 if(!myFlag) {
- StTimer::stTimeCounter_t aNow;
- struct timespec aTimeout;
- StTimer::fillCounter(aNow);
- size_t aSeconds = (theTimeMilliseconds / 1000);
- size_t aMicroseconds = (theTimeMilliseconds - aSeconds * 1000) * 1000;
- #if defined(ST_HAVE_MONOTONIC_CLOCK)
- aTimeout.tv_sec = aNow.tv_sec + (time_t )aSeconds;
- aTimeout.tv_nsec = aNow.tv_nsec + (long )aMicroseconds * 1000;
- #else
- aTimeout.tv_sec = aNow.tv_sec + (time_t )aSeconds;
- aTimeout.tv_nsec = aNow.tv_usec * 1000 + (long )aMicroseconds * 1000;
- #endif
+ struct timespec aNow;
+ struct timespec aTimeout;
+ stGetRealTime(aNow);
+ aTimeout.tv_sec = (theTimeMilliseconds / 1000);
+ aTimeout.tv_nsec = (theTimeMilliseconds - aTimeout.tv_sec * 1000) * 1000000;
+ if(aTimeout.tv_nsec > 1000000000) {
+ aTimeout.tv_sec += 1;
+ aTimeout.tv_nsec -= 1000000000;
+ }
+ aTimeout.tv_sec += aNow.tv_sec;
+ aTimeout.tv_nsec += aNow.tv_nsec;
 isSignalled = (pthread_cond_timedwait(&myCond, &myMutex, &aTimeout) != ETIMEDOUT);
 }
 pthread_mutex_unlock(&myMutex);
@@ -119,17 +138,11 @@
 bool isSignalled = true;
 pthread_mutex_lock(&myMutex);
 if(!myFlag) {
- StTimer::stTimeCounter_t aNow;
- struct timespec aTimeout;
- StTimer::fillCounter(aNow);
- // TODO (Kirill Gavrilov) which values must be here and need we this block here?
- #if defined(ST_HAVE_MONOTONIC_CLOCK)
- aTimeout.tv_sec = aNow.tv_sec;
- aTimeout.tv_nsec = aNow.tv_nsec + 100;
- #else
+ struct timespec aNow;
+ struct timespec aTimeout;
+ stGetRealTime(aNow);
 aTimeout.tv_sec = aNow.tv_sec;
- aTimeout.tv_nsec = aNow.tv_usec * 1000 + 100;
- #endif
+ aTimeout.tv_nsec = aNow.tv_nsec + 100;
 isSignalled = (pthread_cond_timedwait(&myCond, &myMutex, &aTimeout) != ETIMEDOUT);
 }
 pthread_mutex_unlock(&myMutex);
@@ -146,16 +159,11 @@
 pthread_mutex_lock(&myMutex);
 bool wasSignalled = myFlag;
 if(!myFlag) {
- StTimer::stTimeCounter_t aNow;
- struct timespec aTimeout;
- StTimer::fillCounter(aNow);
- #if defined(ST_HAVE_MONOTONIC_CLOCK)
- aTimeout.tv_sec = aNow.tv_sec;
- aTimeout.tv_nsec = aNow.tv_nsec + 100;
- #else
+ struct timespec aNow;
+ struct timespec aTimeout;
+ stGetRealTime(aNow);
 aTimeout.tv_sec = aNow.tv_sec;
- aTimeout.tv_nsec = aNow.tv_usec * 1000 + 100;
- #endif
+ aTimeout.tv_nsec = aNow.tv_nsec + 100;
 wasSignalled = (pthread_cond_timedwait(&myCond, &myMutex, &aTimeout) != ETIMEDOUT);
 }
 myFlag = false;

sview-15_10.tar.gz/StShared/StFileNode2.cpp -> sview-15_11.tar.gz/StShared/StFileNode2.cpp Changed

sview-15_10.tar.gz/StShared/StGLTexture.cpp -> sview-15_11.tar.gz/StShared/StGLTexture.cpp Changed

@@ -45,6 +45,13 @@
             theInternalFormat = GL_RGBA8;
         #endif
             return true;
+        case StImagePlane::ImgRGBA64:
+        #if defined(GL_ES_VERSION_2_0)
+            theInternalFormat = GL_RGBA;
+        #else
+            theInternalFormat = GL_RGBA16;
+        #endif
+            return true;
         case StImagePlane::ImgRGB:
         case StImagePlane::ImgBGR:
         case StImagePlane::ImgRGB32:
@@ -55,6 +62,13 @@
             theInternalFormat = GL_RGB8;
         #endif
             return true;
+        case StImagePlane::ImgRGB48:
+        #if defined(GL_ES_VERSION_2_0)
+            theInternalFormat = GL_RGB;
+        #else
+            theInternalFormat = GL_RGB16;
+        #endif
+            return true;
         case StImagePlane::ImgGrayF:
         #if defined(GL_ES_VERSION_2_0)
             theInternalFormat = GL_ALPHA;
@@ -124,12 +138,22 @@
             return true;
         #endif
         }
+        case StImagePlane::ImgRGB48: {
+            thePixelFormat = GL_RGB;
+            theDataType    = GL_UNSIGNED_SHORT;
+            return true;
+        }
         case StImagePlane::ImgRGBA:
         case StImagePlane::ImgRGB32: {
             thePixelFormat = GL_RGBA;
             theDataType = GL_UNSIGNED_BYTE;
             return true;
         }
+        case StImagePlane::ImgRGBA64: {
+            thePixelFormat = GL_RGBA;
+            theDataType    = GL_UNSIGNED_SHORT;
+            return true;
+        }
         case StImagePlane::ImgBGRA:
         case StImagePlane::ImgBGR32: {
         #if defined(GL_ES_VERSION_2_0)
@@ -441,14 +465,10 @@
 
     GLint anInternalFormat = myTextFormat;
 #if defined(GL_ES_VERSION_2_0)
-    // sized formats are not supported here
-    if(anInternalFormat == GL_RGBA8) {
-        anInternalFormat = GL_RGBA;
-    } else if(anInternalFormat == GL_RGB8) {
-        anInternalFormat = GL_RGB;
-    } else if(anInternalFormat == GL_ALPHA8) {
-        anInternalFormat = GL_ALPHA;
-    }
+    //if(!theCtx.isGlGreaterEqual(3, 0)) {
+        // sized formats are not supported here
+        anInternalFormat = theDataFormat;
+    //}
 #endif
 
     if(myTarget == GL_TEXTURE_CUBE_MAP) {
@@ -473,13 +493,13 @@
     GLenum anErr = theCtx.core20fwd->glGetError();
     if(anErr != GL_NO_ERROR) {
         ST_ERROR_LOG("Creation texture with size (" + mySizeX + " x "+ mySizeY
-                   + " @" + formatInternalFormat(anInternalFormat) + " with data " + formatInternalFormat(theDataFormat) + ") FAILED: " + theCtx.stglErrorToString(anErr) + "!");
+                   + " @" + formatInternalFormat(myTextFormat) + " with data " + formatInternalFormat(theDataFormat) + ") FAILED: " + theCtx.stglErrorToString(anErr) + "!");
         release(theCtx);
         return false;
     }
 #ifdef ST_DEBUG_TEXTURES
     ST_DEBUG_LOG("Created StGLTexture " + mySizeX + " x "+ mySizeY
-               + " (format " + formatInternalFormat(anInternalFormat) + ')');
+               + " (format " + formatInternalFormat(myTextFormat) + ')');
 #endif
 
 #else

sview-15_10.tar.gz/StShared/StGLTextureData.cpp -> sview-15_11.tar.gz/StShared/StGLTextureData.cpp Changed

@@ -30,6 +30,7 @@
 }
 
 void StGLTextureData::reset() {
+ myDataPair.nullify();
 myDataL.nullify();
 myDataR.nullify();
 if(myDataPtr != NULL) {
@@ -325,6 +326,28 @@
 return thePlane.getSizeX() / theCoeffX == thePlane.getSizeY() / theCoeffY;
 }
 
+void StGLTextureData::copyProps(const StImage& theDataL,
+ const StImage& theDataR) {
+ myDataPair.setColorModel(theDataL.getColorModel());
+ myDataPair.setColorScale(theDataL.getColorScale());
+ myDataPair.setPixelRatio(theDataL.getPixelRatio());
+ myDataL.setColorModel(theDataL.getColorModel());
+ myDataL.setColorScale(theDataL.getColorScale());
+ myDataL.setPixelRatio(theDataL.getPixelRatio());
+ myDataR.setColorModel(theDataR.isNull() ? theDataL.getColorModel() : theDataR.getColorModel());
+ myDataR.setColorScale(theDataR.isNull() ? theDataL.getColorScale() : theDataR.getColorScale());
+ myDataR.setPixelRatio(theDataR.isNull() ? theDataL.getPixelRatio() : theDataR.getPixelRatio());
+}
+
+inline bool canCopyReference(const StImage& theData) {
+ if(theData.isNull()) {
+ return true;
+ }
+
+ return !theData.getBufferCounter().isNull()
+ && theData.isTopDown();
+}
+
 void StGLTextureData::updateData(const StImage& theDataL,
 const StImage& theDataR,
 const StHandle<StStereoParams>& theStParams,
@@ -335,27 +358,138 @@
 myStParams = theStParams;
 myPts = thePts;
 mySrcFormat = theFormat != StFormat_AUTO ? theFormat : StFormat_Mono;
- myCubemapFormat = theCubemap;
 
 // reset fill texture state
 myFillRows = myFillFromRow = 0;
 
+ if(canCopyReference(theDataL)
+ && canCopyReference(theDataR)) {
+ bool toCopy = false;
+ switch(mySrcFormat) {
+ case StFormat_SideBySide_LR:
+ case StFormat_SideBySide_RL: {
+ reset();
+ copyProps(theDataL, theDataR);
+ StImage& aDataL = (mySrcFormat == StFormat_SideBySide_LR)
+ ? myDataL : myDataR;
+ StImage& aDataR = (mySrcFormat == StFormat_SideBySide_LR)
+ ? myDataR : myDataL;
+ myDataPair.initReference(theDataL);
+ for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+ const StImagePlane& aFromPlane = myDataPair.getPlane(aPlaneId);
+ if(aFromPlane.isNull()) {
+ continue;
+ }
+ const size_t aSizeX = aFromPlane.getSizeX() / 2;
+ aDataL.changePlane(aPlaneId).initWrapper(aFromPlane.getFormat(),
+ aFromPlane.accessData(0, 0),
+ aSizeX, aFromPlane.getSizeY(),
+ aFromPlane.getSizeRowBytes());
+ aDataR.changePlane(aPlaneId).initWrapper(aFromPlane.getFormat(),
+ aFromPlane.accessData(0, aSizeX),
+ aSizeX, aFromPlane.getSizeY(),
+ aFromPlane.getSizeRowBytes());
+ }
+ break;
+ }
+ case StFormat_TopBottom_LR:
+ case StFormat_TopBottom_RL: {
+ reset();
+ copyProps(theDataL, theDataR);
+ StImage& aDataL = (mySrcFormat == StFormat_TopBottom_LR)
+ ? myDataL : myDataR;
+ StImage& aDataR = (mySrcFormat == StFormat_TopBottom_LR)
+ ? myDataR : myDataL;
+ myDataPair.initReference(theDataL);
+ for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+ const StImagePlane& aFromPlane = myDataPair.getPlane(aPlaneId);
+ if(aFromPlane.isNull()) {
+ continue;
+ }
+ const size_t aSizeY = aFromPlane.getSizeY() / 2;
+ aDataL.changePlane(aPlaneId).initWrapper(aFromPlane.getFormat(),
+ aFromPlane.accessData(0, 0),
+ aFromPlane.getSizeX(), aSizeY,
+ aFromPlane.getSizeRowBytes());
+ aDataR.changePlane(aPlaneId).initWrapper(aFromPlane.getFormat(),
+ aFromPlane.accessData(aSizeY, 0),
+ aFromPlane.getSizeX(), aSizeY,
+ aFromPlane.getSizeRowBytes());
+ }
+ break;
+ }
+ case StFormat_Rows: {
+ reset();
+ copyProps(theDataL, theDataR);
+ myDataL.setPixelRatio(theDataL.getPixelRatio() * 0.5f);
+ myDataR.setPixelRatio(theDataL.getPixelRatio() * 0.5f);
+ StImage& aDataL = myDataL;
+ StImage& aDataR = myDataR;
+ myDataPair.initReference(theDataL);
+ for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+ const StImagePlane& aFromPlane = myDataPair.getPlane(aPlaneId);
+ if(aFromPlane.isNull()) {
+ continue;
+ }
+ const size_t aSizeY = aFromPlane.getSizeY() / 2;
+ aDataL.changePlane(aPlaneId).initWrapper(aFromPlane.getFormat(),
+ aFromPlane.accessData(0, 0),
+ aFromPlane.getSizeX(), aSizeY,
+ aFromPlane.getSizeRowBytes() * 2);
+ aDataR.changePlane(aPlaneId).initWrapper(aFromPlane.getFormat(),
+ aFromPlane.accessData(1, 0),
+ aFromPlane.getSizeX(), aSizeY,
+ aFromPlane.getSizeRowBytes() * 2);
+ }
+ break;
+ }
+ case StFormat_Columns:
+ case StFormat_Tiled4x: {
+ toCopy = true;
+ break;
+ }
+ case StFormat_Mono:
+ case StFormat_SeparateFrames:
+ case StFormat_FrameSequence:
+ case StFormat_AnaglyphRedCyan:
+ case StFormat_AnaglyphGreenMagenta:
+ case StFormat_AnaglyphYellowBlue:
+ case StFormat_AUTO: {
+ reset();
+ copyProps(theDataL, theDataR);
+ myDataL.initReference(theDataL);
+ myDataR.initReference(theDataR);
+ break;
+ }
+ case StFormat_NB: {
+ reset();
+ return;
+ }
+ }
+
+ if(!toCopy) {
+ validateCubemap(theCubemap);
+ return;
+ }
+ }
+
+ myDataPair.setBufferCounter(NULL);
+ myDataL.setBufferCounter(NULL);
+ myDataR.setBufferCounter(NULL);
+
 // reallocate buffer if needed
 const size_t aNewSizeBytes = computeBufferSize(theDataL) + computeBufferSize(theDataR);
 if(aNewSizeBytes == 0) {
 // invalid data
+ myDataPair.nullify();
 myDataL.nullify();
 myDataR.nullify();
+ myCubemapFormat = StCubemap_OFF;
 return;
 }
 
 reAllocate(aNewSizeBytes);
- myDataL.setColorModel(theDataL.getColorModel());
- myDataL.setColorScale(theDataL.getColorScale());
- myDataR.setColorModel(theDataR.isNull() ? theDataL.getColorModel() : theDataR.getColorModel());
- myDataR.setColorScale(theDataR.isNull() ? theDataL.getColorScale() : theDataR.getColorScale());
- myDataL.setPixelRatio(theDataL.getPixelRatio());
- myDataR.setPixelRatio(theDataL.getPixelRatio());
+ copyProps(theDataL, theDataR);
 
 switch(mySrcFormat) {
 case StFormat_SideBySide_LR:
@@ -424,24 +558,32 @@
 break;
 }
 }
- if(myCubemapFormat == StCubemap_Packed) {
- size_t aCoeffs[2] = {0, 0};
- if(!myDataL.isNull()) {
- for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
- const StImagePlane& aPlane = myDataL.getPlane(aPlaneId);
- if(!checkCubeMap(aPlane, aCoeffs[0], aCoeffs[1])) {
- myCubemapFormat = StCubemap_OFF;
- break;
- }
+ validateCubemap(theCubemap);
+}
+
+void StGLTextureData::validateCubemap(const StCubemap theCubemap) {
+ if(theCubemap != StCubemap_Packed) {
+ myCubemapFormat = StCubemap_OFF;
+ return;
+ }
+
+ myCubemapFormat = theCubemap;
+ size_t aCoeffs[2] = {0, 0};
+ if(!myDataL.isNull()) {
+ for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+ const StImagePlane& aPlane = myDataL.getPlane(aPlaneId);
+ if(!checkCubeMap(aPlane, aCoeffs[0], aCoeffs[1])) {
+ myCubemapFormat = StCubemap_OFF;
+ return;
 }
 }
- if(!myDataR.isNull()) {
- for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
- const StImagePlane& aPlane = myDataR.getPlane(aPlaneId);
- if(!checkCubeMap(aPlane, aCoeffs[0], aCoeffs[1])) {
- myCubemapFormat = StCubemap_OFF;
- break;
- }
+ }
+ if(!myDataR.isNull()) {
+ for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
+ const StImagePlane& aPlane = myDataR.getPlane(aPlaneId);
+ if(!checkCubeMap(aPlane, aCoeffs[0], aCoeffs[1])) {
+ myCubemapFormat = StCubemap_OFF;
+ return;
 }
 }
 }
@@ -630,9 +772,9 @@
 void StGLTextureData::getCopy(StImage* theDataL,
 StImage* theDataR) const {
 if(theDataL != NULL) {
- theDataL->initCopy(myDataL);
+ theDataL->initCopy(myDataL, true);
 }
 if(theDataR != NULL) {
- theDataR->initCopy(myDataR);
+ theDataR->initCopy(myDataR, true);
 }
 }

sview-15_10.tar.gz/StShared/StGLTextureQueue.cpp -> sview-15_11.tar.gz/StShared/StGLTextureQueue.cpp Changed

sview-15_10.tar.gz/StShared/StImage.cpp -> sview-15_11.tar.gz/StShared/StImage.cpp Changed

@@ -45,16 +45,18 @@
 //
 }
 
-bool StImage::initCopy(const StImage& theCopy) {
+bool StImage::initCopy(const StImage& theCopy,
+ const bool theIsCompact) {
 nullify();
 setColorModel(theCopy.getColorModel());
 setColorScale(theCopy.getColorScale());
+ myPAR = theCopy.myPAR;
 for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
 const StImagePlane& aFromPlane = theCopy.getPlane(aPlaneId);
 if(aFromPlane.isNull()) {
 continue;
 }
- if(!changePlane(aPlaneId).initCopy(aFromPlane)) {
+ if(!changePlane(aPlaneId).initCopy(aFromPlane, theIsCompact)) {
 return false;
 }
 }
@@ -65,6 +67,7 @@
 nullify();
 setColorModel(theCopy.getColorModel());
 setColorScale(theCopy.getColorScale());
+ myPAR = theCopy.myPAR;
 for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
 const StImagePlane& aFromPlane = theCopy.getPlane(aPlaneId);
 if(aFromPlane.isNull()) {
@@ -77,6 +80,29 @@
 return true;
 }
 
+bool StImage::initReference(const StImage& theCopy) {
+ nullify();
+ if( theCopy.myBufCounter.isNull()
+ || !initWrapper(theCopy)) {
+ return false;
+ }
+
+ theCopy.myBufCounter->createReference(myBufCounter);
+ return true;
+}
+
+bool StImage::initReference(const StImage& theCopy,
+ const StHandle<StBufferCounter>& theRef) {
+ nullify();
+ if( theRef.isNull()
+ || !initWrapper(theCopy)) {
+ return false;
+ }
+
+ theRef->createReference(myBufCounter);
+ return true;
+}
+
 bool StImage::initTrashLimited(const StImage& theRef,
 const size_t theSizeX,
 const size_t theSizeY) {
@@ -189,12 +215,13 @@
 return true;
 }
 
-bool StImage::fill(const StImage& theCopy) {
+bool StImage::fill(const StImage& theCopy,
+ const bool theIsCompact) {
 if(getColorModel() != theCopy.getColorModel()) {
- return initCopy(theCopy);
+ return initCopy(theCopy, theIsCompact);
 }
 for(size_t aPlaneId = 0; aPlaneId < 4; ++aPlaneId) {
- if(!changePlane(aPlaneId).fill(theCopy.getPlane(aPlaneId))) {
+ if(!changePlane(aPlaneId).fill(theCopy.getPlane(aPlaneId), theIsCompact)) {
 nullify();
 return false;
 }
@@ -212,5 +239,8 @@
 myPlanes[1].nullify();
 myPlanes[2].nullify();
 myPlanes[3].nullify();
+ if(!myBufCounter.isNull()) {
+ myBufCounter->releaseReference();
+ }
 myPAR = 1.0f;
 }

sview-15_10.tar.gz/StShared/StImageFile.cpp -> sview-15_11.tar.gz/StShared/StImageFile.cpp Changed

sview-15_10.tar.gz/StShared/StImagePlane.cpp -> sview-15_11.tar.gz/StShared/StImagePlane.cpp Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2010-2013 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -16,8 +16,10 @@
 case ImgBGR: return "ImgBGR";
 case ImgRGB32: return "ImgRGB32";
 case ImgBGR32: return "ImgBGR32";
+ case ImgRGB48: return "ImgRGB48";
 case ImgRGBA: return "ImgRGBA";
 case ImgBGRA: return "ImgBGRA";
+ case ImgRGBA64: return "ImgRGBA64";
 case ImgGrayF: return "ImgGrayF";
 case ImgRGBF: return "ImgRGBF";
 case ImgBGRF: return "ImgBGRF";
@@ -63,10 +65,16 @@
 case ImgBGRA:
 mySizeBPP = 4;
 break;
+ case ImgRGBA64:
+ mySizeBPP = 8;
+ break;
 case ImgRGB32:
 case ImgBGR32:
 mySizeBPP = 4;
 break;
+ case ImgRGB48:
+ mySizeBPP = 6;
+ break;
 case ImgRGB:
 case ImgBGR:
 mySizeBPP = 3;
@@ -129,17 +137,31 @@
 return true;
 }
 
-bool StImagePlane::initCopy(const StImagePlane& theCopy) {
- if(initTrash(theCopy.getFormat(), theCopy.getSizeX(), theCopy.getSizeY(), theCopy.getSizeRowBytes())) {
+bool StImagePlane::initCopy(const StImagePlane& theCopy,
+ const bool theIsCompact) {
+ if(!initTrash(theCopy.myImgFormat, theCopy.mySizeX, theCopy.mySizeY, theIsCompact ? 0 : theCopy.mySizeRowBytes)) {
+ return false;
+ }
+
+ if(mySizeRowBytes == theCopy.mySizeRowBytes) {
 stMemCpy(changeData(), theCopy.getData(), theCopy.getSizeBytes());
 return true;
 }
- return false;
+
+ const size_t aCopyRowBytes = stMin(mySizeRowBytes, theCopy.mySizeRowBytes);
+ for(size_t aRow = 0; aRow < mySizeY; ++aRow) {
+ stMemCpy(changeData(aRow, 0), theCopy.getData(aRow, 0), aCopyRowBytes);
+ }
+ return true;
 }
 
 bool StImagePlane::initWrapper(const StImagePlane& theCopy) {
- return initWrapper(theCopy.getFormat(), theCopy.myDataPtr,
- theCopy.getSizeX(), theCopy.getSizeY(), theCopy.getSizeRowBytes());
+ if(!initWrapper(theCopy.myImgFormat, theCopy.myDataPtr,
+ theCopy.mySizeX, theCopy.mySizeY, theCopy.mySizeRowBytes)) {
+ return false;
+ }
+ myIsTopBottom = theCopy.myIsTopBottom;
+ return true;
 }
 
 bool StImagePlane::initSideBySide(const StImagePlane& theImageL,
@@ -186,16 +208,19 @@
 return true;
 }
 
-bool StImagePlane::fill(const StImagePlane& theCopy) {
+bool StImagePlane::fill(const StImagePlane& theCopy,
+ const bool theIsCompact) {
 if(getSizeY() != theCopy.getSizeY()
 || getSizeRowBytes() != theCopy.getSizeRowBytes()
 || getFormat() != theCopy.getFormat()) {
- return initCopy(theCopy);
+ return initCopy(theCopy, theIsCompact);
 }
+
+ const size_t aCopyRowBytes = stMin(mySizeRowBytes, theCopy.mySizeRowBytes);
 for(size_t row = 0; row < theCopy.getSizeY(); ++row) {
 stMemCpy(changeData(row, 0),
 theCopy.getData(row, 0),
- theCopy.getSizeRowBytes());
+ aCopyRowBytes);
 }
 return true;
 }

sview-15_10.tar.gz/StShared/StPlayList.cpp -> sview-15_11.tar.gz/StShared/StPlayList.cpp Changed

sview-15_10.tar.gz/StShared/StShared.cbp -> sview-15_11.tar.gz/StShared/StShared.cbp Changed

@@ -6,38 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/StShared" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../bin/$(TARGET_NAME)" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_SHARED_DLL" />
-					<Add option="-D__MSVCRT_VERSION__=0x0601" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="user32" />
-					<Add library="gdi32" />
-					<Add library="Advapi32" />
-					<Add library="Comdlg32" />
-					<Add library="Shell32" />
-					<Add library="Ole32.lib" />
-					<Add library="Version" />
-					<Add library="Wsock32" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StShared" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)" />
@@ -68,12 +36,12 @@
 					<Add library="Wsock32" />
 				</Linker>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StShared" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="3" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -296,9 +264,8 @@
 		<Unit filename="StFTLibrary.cpp" />
 		<Unit filename="StFileNode.cpp" />
 		<Unit filename="StFileNode2.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 			<Option target="LINUX_gcc" />
 			<Option target="LINUX_gcc_DEBUG" />
@@ -362,9 +329,8 @@
 		<Unit filename="StProcess2.cpp" />
 		<Unit filename="StRawFile.cpp" />
 		<Unit filename="StRegisterImpl.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Unit filename="StResourceManager.cpp" />
@@ -389,6 +355,7 @@
 		<Unit filename="stAV.cpp" />
 		<Unit filename="stConsole.cpp" />
 		<Unit filename="stUtfTools.cpp" />
+		<Unit filename="../include/StAV/StAVBufferPool.h" />
 		<Unit filename="../include/StAV/StAVFrame.h" />
 		<Unit filename="../include/StAV/StAVImage.h" />
 		<Unit filename="../include/StAV/StAVPacket.h" />
@@ -545,9 +512,8 @@
 		<Unit filename="../include/stconfig.conf" />
 		<Unit filename="StShared.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 		</Unit>
 		<Extensions>

sview-15_10.tar.gz/StShared/stAV.cpp -> sview-15_11.tar.gz/StShared/stAV.cpp Changed

@@ -108,6 +108,7 @@
 const PixelFormat stAV::PIX_FMT::YUV410P    = ST_AV_GETPIXFMT("yuv410p");
 const PixelFormat stAV::PIX_FMT::YUV411P    = ST_AV_GETPIXFMT("yuv411p");
 const PixelFormat stAV::PIX_FMT::YUV440P    = ST_AV_GETPIXFMT("yuv440p");
+const PixelFormat stAV::PIX_FMT::NV12       = ST_AV_GETPIXFMT("nv12");
 const PixelFormat stAV::PIX_FMT::YUV420P9   = ST_AV_GETPIXFMT("yuv420p9");
 const PixelFormat stAV::PIX_FMT::YUV422P9   = ST_AV_GETPIXFMT("yuv422p9");
 const PixelFormat stAV::PIX_FMT::YUV444P9   = ST_AV_GETPIXFMT("yuv444p9");
@@ -123,6 +124,11 @@
 const PixelFormat stAV::PIX_FMT::YUVJ440P   = ST_AV_GETPIXFMT("yuvj440p");
 const PixelFormat stAV::PIX_FMT::RGB24      = ST_AV_GETPIXFMT("rgb24");
 const PixelFormat stAV::PIX_FMT::BGR24      = ST_AV_GETPIXFMT("bgr24");
+const PixelFormat stAV::PIX_FMT::RGB48      = ST_AV_GETPIXFMT("rgb48");
+const PixelFormat stAV::PIX_FMT::BGR48      = ST_AV_GETPIXFMT("bgr48");
+const PixelFormat stAV::PIX_FMT::RGBA64     = ST_AV_GETPIXFMT("rgba64");
+const PixelFormat stAV::PIX_FMT::BGRA64     = ST_AV_GETPIXFMT("bgra64");
+const PixelFormat stAV::PIX_FMT::DXVA2_VLD  = ST_AV_GETPIXFMT("dxva2_vld");
 
 // TODO (Kirill Gavrilov#9) remove this stuff
 namespace {
@@ -189,6 +195,8 @@
         return stCString("rgb24");
     } else if(theFrmt == stAV::PIX_FMT::BGR24) {
         return stCString("bgr24");
+    } else if(theFrmt == stAV::PIX_FMT::NV12) {
+        return stCString("nv12");
     } else {
         return stCString("unknown");
     }
@@ -512,13 +520,11 @@
     return true;
 }
 
-bool stAV::meta::readTag(AVFrame*         theFrame,
-                         const StCString& theKey,
-                         StString&        theValue) {
+stAV::meta::Dict* stAV::meta::getFrameMetadata(AVFrame* theFrame) {
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 38, 100)) && !defined(ST_LIBAV_FORK)
-    return readTag(av_frame_get_metadata(theFrame), theKey, theValue);
+    return av_frame_get_metadata(theFrame);
 #else
-    return false;
+    return NULL;
 #endif
 }

sview-15_10.tar.gz/StTests/StTestGlBand.cpp -> sview-15_11.tar.gz/StTests/StTestGlBand.cpp Changed

sview-15_10.tar.gz/StTests/StTests.cbp -> sview-15_11.tar.gz/StTests/StTests.cbp Changed

@@ -6,33 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/StTests" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../bin/$(TARGET_NAME)/" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="demo.jps" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="opengl32" />
-					<Add library="gdi32" />
-					<Add library="user32" />
-					<Add library="kernel32" />
-					<Add library="Comdlg32" />
-					<Add library="Version" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/StTests" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
@@ -65,12 +38,12 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /manifest &quot;..\dpiAware.manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;1' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/StTests" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="1" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option parameters="demo.jps" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -271,9 +244,8 @@
 			<Option target="MAC_gcc_DEBUG" />
 		</Unit>
 		<Unit filename="main.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 			<Option target="LINUX_gcc" />
 			<Option target="LINUX_gcc_DEBUG" />

sview-15_10.tar.gz/distribution/build.iss -> sview-15_11.tar.gz/distribution/build.iss Changed

@@ -166,7 +166,6 @@
 Source: {#SVIEW_DISTR_PATH_AMD64}\StCore.dll;     DestDir: {app}\amd64;  Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
 Source: {#SVIEW_DISTR_PATH_x86}\StDiagnostics.dll;   DestDir: {app};       Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_AMD64}\StDiagnostics.dll; DestDir: {app}\amd64; Flags: 64bit ignoreversion; Components: StCore; Check: IsWin64
-Source: {#SVIEW_DISTR_PATH_x86}\shaders\StGLWidgets\*;         DestDir: {app}\shaders\StGLWidgets;       Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_x86}\lang\Korean\language.lng;      DestDir: {app}\lang\Korean;               Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_x86}\lang\ChineseS\language.lng;    DestDir: {app}\lang\ChineseS;             Flags: 32bit ignoreversion; Components: StCore
 Source: {#SVIEW_DISTR_PATH_x86}\lang\Czech\language.lng;       DestDir: {app}\lang\Czech;                Flags: 32bit ignoreversion; Components: StCore

sview-15_10.tar.gz/distribution/buildDebSrc.sh -> sview-15_11.tar.gz/distribution/buildDebSrc.sh Changed

sview-15_10.tar.gz/distribution/buildDebSrc_ppa.sh -> sview-15_11.tar.gz/distribution/buildDebSrc_ppa.sh Changed

sview-15_10.tar.gz/distribution/media/sView_SetupMac.png -> sview-15_11.tar.gz/distribution/media/sView_SetupMac.png Changed

sview-15_11.tar.gz/docs/INSTALL.md Added

@@ -0,0 +1,113 @@
+## I. Installing 3rd-parties
+
+sView requires several 3rd-party components for building:
+* C/C++ compiler (g++, MSVC 2010+)
+* Code::Blocks (http://www.codeblocks.org)
+* FFmpeg (http://www.ffmpeg.org)
+* OpenAL soft (http://kcat.strangesoft.net/openal.html)
+* libwebp, optional (https://developers.google.com/speed/webp/download)
+* GTK2+, Linux only (http://www.gtk.org)
+* libconfig++, Linux and Android (http://www.hyperrealm.com/libconfig)
+* libxpm, Linux only
+
+On Debian/Ubuntu you might use the following command to install all dependencies at once:
+
+~~~~~
+sudo apt-get install \
+ g++ \
+ libgtk2.0-dev \
+ libopenal-dev \
+ libgl1-mesa-dev \
+ libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev \
+ libwebp-dev \
+ libconfig++-dev libconfig-dev \
+ libxpm-dev \
+ codeblocks
+~~~~~
+ 
+The similar command for RPM-based distributives:
+
+~~~~~
+yum install gcc gcc-c++ \
+ gtk+-devel gtk2-devel \
+ mesa-libGLU-devel glew-devel \
+ openal-devel \
+ libconfig-devel
+
+rpm -Uvh http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm
+yum install ffmpeg-devel
+~~~~~
+
+On Windows and Mac OS X please refer to official documentation for each project.
+Notice that DevIL and FreeImage libraries are optional and need not for building sView
+(libraries are loaded dynamically if available).
+
+## II. Makefile on Linux
+
+Current Makefile has been written only for DEB/RPM source packages
+and lacks configuration flexibility (means there NO any ./configure and so on).
+
+All you need is to install dependencies and to execute traditional commands:
+
+~~~~~
+  make && make install
+~~~~~
+
+## III. Code::Blocks
+
+Code::Blocks is an official way for building and development of sView.
+There are several building targets depending on platform
+(Mac OS X, Linux, Windows) and debugging possibilities:
+* `WIN_vc_x86`,        32-bit target using Visual Studio compiler
+* `WIN_vc_AMD64_DEBUG`,64-bit target with debugging options
+* `WIN_vc_AMD64`,      64-bit target using Visual Studio compiler
+* `LINUX_gcc`,         Linux target, g++ compiler
+* `LINUX_gcc_DEBUG`,   Linux target with debugging options
+* `MAC_gcc`,           Mac OS X target, g++ compatible compiler
+* `MAC_gcc_DEBUG`,     Mac OS X target with debugging options
+
+Notice that the following compilers should be configured within Code::Blocks:
+* `gcc`,               configured to g++ or compatible compiler (on systems other than Windows)
+* `msvc10`,            configured to Visual Studio 2010+ compiler, PSDK and DXSDK
+* `windows_sdk_x86_64` (copy of msvc10) configured to 64-bit libraries and compiler toolchain
+
+3rd-parties should be either configured as Code::Blocks global compiler options
+or placed into "3rdparty" folder.
+
+## IV. Building options
+
+Several preprocessor directives control building options.
+Notice that by default "include/stconfig.conf" file is used to override these options
+(this file will be used only when ST_HAVE_STCONFIG is defined).
+
+* `ST_HAVE_WEBP` - should be defined to activate libwebp usage
+  (notice that since next releases of FFmpeg might have built-in support for webp/webpll image files)
+* `ST_HAVE_MONGOOSE` - should be defined to activate built-in web UI for remote Movie Player control
+* `ST_DEBUG` - should be defined to activate debugging log output
+* `ST_DEBUG_LOG_TO_FILE` - specifies file name or full path to duplicate debug log output
+
+## V. Distribution scripts
+
+Several script were written to automate distribution routines.
+All them were placed in "distribution" folder.
+
+* `build.bat`, batch script for Windows. Performs re-building of **WIN_vc_x86** and **WIN_vc_AMD64** targets
+  using Code::Blocks and pack result binaries using InnoSetup script.
+  Notice that all dependencies should be available (including InnoSetup),
+  and DLLs should be placed into **bin/WIN_vc_x86** and **bin/WIN_vc_AMD64** folders.
+* `buildDebSrc.sh`, bash script for Linux to pack sources into Debian source package.
+* `buildMac.sh`, bash script to pack binaries from **bin/MAC_gcc** folder into DMG image.
+  3rd-party libraries should be already located in "bin/MAC_gcc_DEBUG/sView.app/Contents/Frameworks/"
+  folder with correct search path (refer to `bind_frameworks.sh` auxiliary script).
+
+~~~~~
+su
+yum install rpm-build
+
+mkdir -p ${HOME}/workspace/redhat/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
+echo "%_topdir ${HOME}/workspace/redhat" > ${HOME}/.rpmmacros
+
+wget https://launchpad.net/~sview/+archive/stable/+files/sview_12.05-1%7Eprecise.tar.gz
+mv sview_12.05-1~precise.tar.gz $HOME/workspace/redhat/SOURCES/sview_12.05-1.tar.gz
+rpmbuild -ba distribution/sView.rpm.spec
+~~~~~

sview-15_11.tar.gz/include/StAV/StAVBufferPool.h Added

@@ -0,0 +1,104 @@
+/**
+ * Copyright © 2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef __StAVBufferPool_h_
+#define __StAVBufferPool_h_
+
+#include <StAV/stAV.h>
+
+struct AVBufferPool;
+struct AVBufferRef;
+
+/**
+ * This is just a wrapper over AVBufferPool structure.
+ */
+class StAVBufferPool {
+
+ public:
+
+ /**
+ * Empty constructor
+ */
+ ST_LOCAL StAVBufferPool()
+ : myPool(NULL),
+ myBufferSize(0) {
+ //
+ }
+
+ /**
+ * Destructor
+ */
+ ST_LOCAL ~StAVBufferPool() {
+ release();
+ }
+
+ /**
+ * Release the pool (reference-counted buffer will be released when needed).
+ */
+ ST_LOCAL void release() {
+ #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ if(myPool != NULL) {
+ av_buffer_pool_uninit(&myPool);
+ myPool = NULL;
+ myBufferSize = 0;
+ }
+ #endif
+ }
+
+ /**
+ * (Re-)initialize the pool.
+ */
+ ST_LOCAL bool init(const int theBufferSize) {
+ if(myBufferSize == theBufferSize) {
+ return true;
+ }
+
+ release();
+ if(theBufferSize == 0) {
+ return true;
+ }
+
+ #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ myPool = av_buffer_pool_init(theBufferSize, NULL);
+ myBufferSize = theBufferSize;
+ return myPool != NULL;
+ #else
+ return false;
+ #endif
+ }
+
+ /**
+ * Return buffer size within the pool.
+ */
+ int getBufferSize() const {
+ return myBufferSize;
+ }
+
+ /**
+ * Get new buffer from the pool.
+ */
+ ST_LOCAL AVBufferRef* getBuffer() {
+ #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101))
+ return av_buffer_pool_get(myPool);
+ #else
+ return NULL;
+ #endif
+ }
+
+ private:
+
+ StAVBufferPool(const StAVBufferPool& theCopy);
+
+ private:
+
+ AVBufferPool* myPool;
+ int myBufferSize;
+
+};
+
+#endif // __StAVBufferPool_h_

sview-15_10.tar.gz/include/StAV/StAVFrame.h -> sview-15_11.tar.gz/include/StAV/StAVFrame.h Changed

sview-15_10.tar.gz/include/StAV/StAVImage.h -> sview-15_11.tar.gz/include/StAV/StAVImage.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2011-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2011-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -10,17 +10,20 @@
 #define __StAVImage_h_
 
 #include <StImage/StImageFile.h>
+#include <StAV/StAVFrame.h>
 
 struct AVInputFormat;
 struct AVFormatContext;
 struct AVCodecContext;
 struct AVCodec;
-struct AVFrame;
 
 // define StHandle template specialization
 class StAVImage;
 ST_DEFINE_HANDLE(StAVImage, StImageFile);
 
+class StAVFrameCounter;
+ST_DEFINE_HANDLE(StAVFrameCounter, StBufferCounter);
+
 /**
 * This class implements image load/save operation using libav* libraries.
 */
@@ -78,13 +81,59 @@
 
 ST_LOCAL static int getAVPixelFormat(const StImage& theImage);
 
+ /**
+ * Close currently opened image context and release memory.
+ */
+ ST_LOCAL void closeAvCtx();
+
 private:
 
 AVInputFormat* myImageFormat; //!< image format
 AVFormatContext* myFormatCtx; //!< file context
 AVCodecContext* myCodecCtx; //!< codec context
 AVCodec* myCodec; //!< codec
- AVFrame* myFrame;
+ StAVFrame myFrame;
+
+};
+
+/**
+ * Pass reference-counted AVFrame (e.g. AVBuffer) into StImage without data copying.
+ */
+class StAVFrameCounter : public StBufferCounter {
+
+ public:
+
+ /**
+ * Default constructor.
+ */
+ ST_CPPEXPORT StAVFrameCounter();
+
+ /**
+ * Create the new reference (e.g. increment counter).
+ * If theOther has the same type, than the ref counter will be reused.
+ * Otherwise then new counter will be allocated.
+ */
+ ST_CPPEXPORT virtual void createReference(StHandle<StBufferCounter>& theOther) const;
+
+ /**
+ * Release current reference.
+ */
+ ST_CPPEXPORT virtual void releaseReference();
+
+ /**
+ * Release reference counter.
+ */
+ ST_CPPEXPORT virtual ~StAVFrameCounter();
+
+ /**
+ * Initialize a proxy reference.
+ */
+ ST_CPPEXPORT void moveReferenceFrom(AVFrame* theFrame);
+
+ private:
+
+ AVFrame* myFrame; //!< frame
+ bool myIsProxy; //!< proxy reference to be moved, not copied
 
 };

sview-15_10.tar.gz/include/StAV/stAV.h -> sview-15_11.tar.gz/include/StAV/stAV.h Changed

@@ -206,6 +206,7 @@
 ST_SHARED_CPPEXPORT PixelFormat YUV410P; //!< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples)
 ST_SHARED_CPPEXPORT PixelFormat YUV411P; //!< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
 ST_SHARED_CPPEXPORT PixelFormat YUV440P; //!< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+ ST_SHARED_CPPEXPORT PixelFormat NV12; //!< YUV420, Y plane + interleaved UV plane oh half width and height
 // wide planar YUV formats (9,10,14,16 bits stored in 16 bits)
 ST_SHARED_CPPEXPORT PixelFormat YUV420P9;
 ST_SHARED_CPPEXPORT PixelFormat YUV422P9;
@@ -225,8 +226,14 @@
 // RGB formats
 ST_SHARED_CPPEXPORT PixelFormat RGB24; //!< packed RGB 8:8:8, 24bpp, RGBRGB...
 ST_SHARED_CPPEXPORT PixelFormat BGR24; //!< packed RGB 8:8:8, 24bpp, BGRBGR...
+ ST_SHARED_CPPEXPORT PixelFormat RGB48;
+ ST_SHARED_CPPEXPORT PixelFormat BGR48;
 ST_SHARED_CPPEXPORT PixelFormat RGBA32;
 ST_SHARED_CPPEXPORT PixelFormat BGRA32;
+ ST_SHARED_CPPEXPORT PixelFormat RGBA64;
+ ST_SHARED_CPPEXPORT PixelFormat BGRA64;
+ // HWAccel formats
+ ST_SHARED_CPPEXPORT PixelFormat DXVA2_VLD;
 
 ST_CPPEXPORT StCString getString(const PixelFormat theFrmt);
 }
@@ -282,6 +289,21 @@
 #endif
 
 /**
+ * Check is stream represents attached picture (e.g. NOT a video stream).
+ */
+ inline bool isAttachedPicture(const AVStream* theStream) {
+ if(theStream == NULL) {
+ return false;
+ }
+
+ #if(LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 100))
+ return (theStream->disposition & AV_DISPOSITION_ATTACHED_PIC) != 0;
+ #else
+ return false;
+ #endif
+ }
+
+ /**
 * Audio functions
 */
 namespace audio {
@@ -342,7 +364,12 @@
 #endif
 
 /**
- * Alias to av_dict_get.
+ * Alias for av_frame_get_metadata().
+ */
+ ST_CPPEXPORT Dict* getFrameMetadata(AVFrame* theFrame);
+
+ /**
+ * Alias for av_dict_get().
 */
 ST_CPPEXPORT Tag* findTag(Dict* theDict,
 const char* theKey,
@@ -360,21 +387,32 @@
 const StCString& theKey,
 StString& theValue);
 
+ /**
+ * Read tag from Format Context metadata.
+ */
 inline bool readTag(AVFormatContext* theFormatCtx,
 const StCString& theKey,
 StString& theValue) {
 return readTag(theFormatCtx->metadata, theKey, theValue);
 }
 
+ /**
+ * Read tag from Stream metadata.
+ */
 inline bool readTag(AVStream* theStream,
 const StCString& theKey,
 StString& theValue) {
 return readTag(theStream->metadata, theKey, theValue);
 }
 
- ST_CPPEXPORT bool readTag(AVFrame* theFrame,
- const StCString& theKey,
- StString& theValue);
+ /**
+ * Read tag from Frame metadata.
+ */
+ inline bool readTag(AVFrame* theFrame,
+ const StCString& theKey,
+ StString& theValue) {
+ return readTag(getFrameMetadata(theFrame), theKey, theValue);
+ }
 
 }
 
@@ -399,19 +437,32 @@
 /**
 * Convert stereo3d enumeration from sView to FFmpeg definition.
 */
- ST_LOCAL inline AVStereo3DType stereo3dStToAv(const StFormat theType) {
+ ST_LOCAL inline AVStereo3DType stereo3dStToAv(const StFormat theType,
+ bool& theIsReversed) {
+ theIsReversed = false;
 switch(theType) {
 default:
- case StFormat_AUTO: return (AVStereo3DType )-1;
- case StFormat_Mono: return AV_STEREO3D_2D;
+ case StFormat_AUTO:
+ return (AVStereo3DType )-1;
+ case StFormat_Mono:
+ return AV_STEREO3D_2D;
+ case StFormat_SideBySide_RL:
+ theIsReversed = true;
+ return AV_STEREO3D_SIDEBYSIDE;
 case StFormat_SideBySide_LR:
- case StFormat_SideBySide_RL: return AV_STEREO3D_SIDEBYSIDE;
+ return AV_STEREO3D_SIDEBYSIDE;
+ case StFormat_TopBottom_RL:
+ theIsReversed = true;
+ return AV_STEREO3D_TOPBOTTOM;
 case StFormat_TopBottom_LR:
- case StFormat_TopBottom_RL: return AV_STEREO3D_TOPBOTTOM;
- case StFormat_Rows: return AV_STEREO3D_LINES;
- case StFormat_Columns: return AV_STEREO3D_COLUMNS;
+ return AV_STEREO3D_TOPBOTTOM;
+ case StFormat_Rows:
+ return AV_STEREO3D_LINES;
+ case StFormat_Columns:
+ return AV_STEREO3D_COLUMNS;
 //case StFormat_SeparateFrames:
- case StFormat_FrameSequence: return AV_STEREO3D_FRAMESEQUENCE;
+ case StFormat_FrameSequence:
+ return AV_STEREO3D_FRAMESEQUENCE;
 //case StFormat_AnaglyphRedCyan:
 //case StFormat_AnaglyphGreenMagenta:
 //case StFormat_AnaglyphYellowBlue:

sview-15_10.tar.gz/include/StCore/StAndroidGlue.h -> sview-15_11.tar.gz/include/StCore/StAndroidGlue.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2014-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #if defined(__ANDROID__)
@@ -89,6 +80,12 @@
 */
 static StCString getCommandIdName(StAndroidGlue::CommandId theCmd);
 
+ /**
+ * Retrieve path using android.os.Environment.getExternalStoragePublicDirectory().
+ */
+ static StString getStoragePath(JNIEnv* theJEnv,
+ const char* theType);
+
 public: //! @name interface to implement
 
 /**
@@ -384,6 +381,7 @@
 StAndroidPollSource myInputPollSource;
 
 StMutex myFetchLock; //!< fetch data lock
+ StString myStAppClass; //!< application class name (e.g. image, video)
 StString myDndPath; //!< intent data string
 StString myCreatePath; //!< intent data string used to open this activity
 StQuaternion<double> myQuaternion; //!< device orientation

sview-15_10.tar.gz/include/StCore/StApplication.h -> sview-15_11.tar.gz/include/StCore/StApplication.h Changed

@@ -1,19 +1,10 @@
 /**
- * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StApplication_h_
@@ -25,6 +16,7 @@
 #include <StSlots/StAction.h>
 
 #include <map>
+#include <string>
 
 class StEventsBuffer;
 class StSettings;
@@ -135,6 +127,11 @@
 */
 ST_LOCAL const std::map< int, StHandle<StAction> >& getActions() const { return myActions; }
 
+ /**
+ * Find action ID for specified Action Name.
+ */
+ ST_CPPEXPORT int getActionIdFromName(const StString& theActionName) const;
+
 protected:
 
 /**
@@ -275,6 +272,8 @@
 StHandle<StOpenInfo> myOpenFileInfo; //!< file to open
 std::map< int, StHandle<StAction> >
 myActions; //!< ID -> Action map
+ std::map< std::string, int >
+ myActionLookup; //!< lookup map ActionName -> ActionID
 std::map< unsigned int, StHandle<StAction> >
 myKeyActions; //!< Hot Key -> Action map
 StHandle<StEventsBuffer>

sview-15_10.tar.gz/include/StCore/StEDIDParser.h -> sview-15_11.tar.gz/include/StCore/StEDIDParser.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2010-2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StEDIDParser_h_

sview-15_10.tar.gz/include/StCore/StEvent.h -> sview-15_11.tar.gz/include/StCore/StEvent.h Changed

@@ -1,19 +1,10 @@
 /**
- * Copyright © 2013 Kirill Gavrilov <kirill@sview.ru>
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
+ * Copyright © 2013-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StEvent_h_
@@ -118,7 +109,8 @@
 
 StEventType Type; //!< event type
 double Time; //!< time in seconds when event was registered
- const char* File; //!< file path
+ const char** Files; //!< file paths
+ uint32_t NbFiles;//!< number of files
 
 };

sview-15_10.tar.gz/include/StCore/StKeysState.h -> sview-15_11.tar.gz/include/StCore/StKeysState.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2013 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StKeysState_h_

sview-15_10.tar.gz/include/StCore/StMonitor.h -> sview-15_11.tar.gz/include/StCore/StMonitor.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StMonitor_h_

sview-15_10.tar.gz/include/StCore/StNativeWin_t.h -> sview-15_11.tar.gz/include/StCore/StNativeWin_t.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StNativeWin_t_h_

sview-15_10.tar.gz/include/StCore/StOpenInfo.h -> sview-15_11.tar.gz/include/StCore/StOpenInfo.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2011 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StOpenInfo_h_

sview-15_10.tar.gz/include/StCore/StSearchMonitors.h -> sview-15_11.tar.gz/include/StCore/StSearchMonitors.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StSearchMonitors_h_

sview-15_10.tar.gz/include/StCore/StVirtualKeys.h -> sview-15_11.tar.gz/include/StCore/StVirtualKeys.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StVirtualKey_h_
@@ -305,7 +296,7 @@
 ST_VK_COMMA = 0xBC, // 188 = VK_OEM_COMMA | ',' any country
 ST_VK_OEM_MINUS = 0xBD, // 189 = VK_OEM_MINUS | '-' any country
 ST_VK_PERIOD = 0xBE, // 190 = VK_OEM_PERIOD | '.' any country
- ///ST_VK_OEM_2 = 0xBF, // 191 = VK_OEM_2 | '/?' for US
+ ST_VK_SLASH = 0xBF, // 191 = VK_OEM_2 | '/?' for US
 ///ST_VK_OEM_3 = 0xC0, // 192 = VK_OEM_3 | '`~' for US*
 
 ST_VK_BRACKETLEFT = 0xDB, // 219 = VK_OEM_4 | '[{' for US

sview-15_10.tar.gz/include/StCore/StWinErrorCodes.h -> sview-15_11.tar.gz/include/StCore/StWinErrorCodes.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2009 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StWinErrorCodes_h_

sview-15_10.tar.gz/include/StCore/StWindow.h -> sview-15_11.tar.gz/include/StCore/StWindow.h Changed

@@ -1,19 +1,10 @@
 /**
+ * StCore, window system independent C++ toolkit for writing OpenGL applications.
 * Copyright © 2007-2015 Kirill Gavrilov <kirill@sview.ru>
 *
- * StCore library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * StCore library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
 */
 
 #ifndef __StWindow_h_
@@ -85,6 +76,8 @@
 StWinSlave_splitOff, //!< do not split the window
 StWinSlave_splitHorizontal, //!< split window horizontally
 StWinSlave_splitVertical, //!< split window vertically
+ StWinSlave_splitVertHdmi720, //!< split window vertically (2x 1280x720 + 30 pixels between)
+ StWinSlave_splitVertHdmi1080 //!< split window vertically (2x 1920x1080 + 45 pixels between)
 };
 
 /**

sview-15_10.tar.gz/include/StGL/StPlayList.h -> sview-15_11.tar.gz/include/StGL/StPlayList.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2009-2014 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -114,6 +114,19 @@
 public:
 
 /**
+ * Enumeration identifying position of current item in the playlist.
+ */
+ enum CurrentPosition {
+ CurrentPosition_NONE, //!< empty list
+ CurrentPosition_Single, //!< single item
+ CurrentPosition_First, //!< first in the list
+ CurrentPosition_Last, //!< last in the list
+ CurrentPosition_Middle, //!< somewhere in the list
+ };
+
+ public:
+
+ /**
 * Main constructor.
 */
 ST_CPPEXPORT StPlayList(const int theRecursionDeep,
@@ -149,6 +162,12 @@
 ST_CPPEXPORT size_t getCurrentId() const;
 
 /**
+ * Return item index for the current position in playlist
+ * and flags if it is last or first
+ */
+ ST_CPPEXPORT StPlayList::CurrentPosition getCurrentPosition() const;
+
+ /**
 * Return title for the current position in playlist.
 * Will be empty string if playlist is empty.
 */
@@ -231,7 +250,7 @@
 return myItemsCount;
 }
 
- inline bool isEmpty() const {
+ ST_LOCAL bool isEmpty() const {
 StMutexAuto anAutoLock(myMutex);
 return myFirst == NULL;
 }

sview-15_10.tar.gz/include/StGLStereo/StGLTextureData.h -> sview-15_11.tar.gz/include/StGLStereo/StGLTextureData.h Changed

@@ -51,8 +51,13 @@
 return myStParams;
 }
 
- inline void resetStParams() {
+ ST_LOCAL void resetStParams() {
 myStParams.nullify();
+ if(!myDataPair.getBufferCounter().isNull()
+ || !myDataL.getBufferCounter().isNull()
+ || !myDataR.getBufferCounter().isNull()) {
+ reset();
+ }
 }
 
 /**
@@ -148,9 +153,16 @@
 
 private:
 
-
 ST_LOCAL bool reAllocate(const size_t theSizeBytes);
 
+ ST_LOCAL void copyProps(const StImage& theDataL,
+ const StImage& theDataR);
+
+ /**
+ * Validate and setup packed cubemap flag.
+ */
+ ST_LOCAL void validateCubemap(const StCubemap theCubemap);
+
 /**
 * Fill the texture plane.
 */
@@ -167,6 +179,7 @@
 
 GLubyte* myDataPtr; //!< data for left and right views
 size_t myDataSizeBytes; //!< allocated data size in bytes
+ StImage myDataPair;
 StImage myDataL;
 StImage myDataR;

sview-15_10.tar.gz/include/StGLWidgets/StGLAssignHotKey.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLAssignHotKey.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLButton.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLButton.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLCheckbox.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLCheckbox.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLCheckboxTextured.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLCheckboxTextured.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLCombobox.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLCombobox.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLCorner.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLCorner.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLDescription.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLDescription.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLFpsLabel.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLFpsLabel.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLImageProgram.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLImageProgram.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLImageRegion.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLImageRegion.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMenu.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMenu.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMenuCheckbox.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMenuCheckbox.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMenuItem.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMenuItem.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMenuProgram.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMenuProgram.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMenuRadioButton.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMenuRadioButton.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMessageBox.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMessageBox.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLMsgStack.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLMsgStack.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLOpenFile.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLOpenFile.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLPlayList.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLPlayList.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLRadioButton.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLRadioButton.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLRadioButtonFloat32.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLRadioButtonFloat32.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLRadioButtonTextured.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLRadioButtonTextured.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLRangeFieldFloat32.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLRangeFieldFloat32.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLRootWidget.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLRootWidget.h Changed

@@ -1,4 +1,5 @@
 /**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
 * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
@@ -18,6 +19,8 @@
 template<> inline void StArray<StGLNamedTexture>::sort() {}
 typedef StArray<StGLNamedTexture> StGLTextureArray;
 class StGLMenuProgram;
+class StGLTextProgram;
+class StGLTextBorderProgram;
 
 /**
 * Full OpenGL-window widget, must be ROOT for other widgets.
@@ -109,6 +112,16 @@
 ST_LOCAL StGLMenuProgram& getMenuProgram() { return *myMenuProgram; }
 
 /**
+ * Get shared text program instance.
+ */
+ ST_LOCAL StGLTextProgram& getTextProgram() { return *myTextProgram; }
+
+ /**
+ * Get shared text border program instance.
+ */
+ ST_LOCAL StGLTextBorderProgram& getTextBorderProgram() { return *myTextBorderProgram; }
+
+ /**
 * Return color of standard element.
 */
 ST_LOCAL const StGLVec4& getColorForElement(const StGLRootWidget::Color theElement) const { return myColors[theElement]; }
@@ -434,6 +447,8 @@
 StHandle<StGLTextureArray> myCheckboxIcon;
 StHandle<StGLTextureArray> myRadioIcon;
 StHandle<StGLMenuProgram> myMenuProgram;
+ StHandle<StGLTextProgram> myTextProgram;
+ StHandle<StGLTextBorderProgram> myTextBorderProgram;
 
 bool myIsMobile; //!< flag indicating mobile device
 StMarginsI myMarginsPx; //!< active area margins in pixels

sview-15_10.tar.gz/include/StGLWidgets/StGLScrollArea.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLScrollArea.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLShare.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLShare.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLSubtitles.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLSubtitles.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLSwitchTextured.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLSwitchTextured.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLTable.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLTable.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLTextArea.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLTextArea.h Changed

sview-15_11.tar.gz/include/StGLWidgets/StGLTextBorderProgram.h Added

@@ -0,0 +1,79 @@
+/**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef __StGLTextBorderProgram_h_
+#define __StGLTextBorderProgram_h_
+
+#include <StGL/StGLProgram.h>
+#include <StGL/StGLVec.h>
+
+class StGLMatrix;
+
+/**
+ * GLSL program for rendering border around 2D text.
+ */
+class StGLTextBorderProgram : public StGLProgram {
+
+ public:
+
+ /**
+ * Empty constructor.
+ */
+ ST_CPPEXPORT StGLTextBorderProgram();
+
+ /**
+ * Destructor.
+ */
+ ST_CPPEXPORT virtual ~StGLTextBorderProgram();
+
+ /**
+ * Return location of vertex attribute defining position.
+ */
+ ST_LOCAL StGLVarLocation getVVertexLoc() const { return StGLVarLocation(0); }
+
+ /**
+ * Setup projection matrix.
+ * @param theCtx active GL context
+ * @param theProjMat projection matrix
+ */
+ ST_CPPEXPORT void setProjMat(StGLContext& theCtx,
+ const StGLMatrix& theProjMat);
+
+ /**
+ * Setup model-view matrix.
+ * @param theCtx active GL context
+ * @param theModelMat model-view matrix
+ */
+ ST_CPPEXPORT void setModelMat(StGLContext& theCtx,
+ const StGLMatrix& theModelMat);
+
+ /**
+ * Setup text color.
+ * @param theCtx active GL context
+ * @param theColor color
+ */
+ ST_CPPEXPORT void setColor(StGLContext& theCtx,
+ const StGLVec4& theColor);
+
+ /**
+ * Initialize program.
+ * @param theCtx active GL context
+ * @return true if no error
+ */
+ ST_CPPEXPORT virtual bool init(StGLContext& theCtx);
+
+ private:
+
+ StGLVarLocation myUniformProjMat; //!< location of uniform variable of projection matrix
+ StGLVarLocation myUniformModelMat; //!< location of uniform variable of model view matrix
+ StGLVarLocation myUniformColor; //!< location of uniform variable of color value
+
+};
+
+#endif // __StGLTextBorderProgram_h_

sview-15_11.tar.gz/include/StGLWidgets/StGLTextProgram.h Added

@@ -0,0 +1,86 @@
+/**
+ * StGLWidgets, small C++ toolkit for writing GUI using OpenGL.
+ * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>
+ *
+ * Distributed under the Boost Software License, Version 1.0.
+ * See accompanying file license-boost.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt
+ */
+
+#ifndef __StGLTextProgram_h_
+#define __StGLTextProgram_h_
+
+#include <StGL/StGLProgram.h>
+#include <StGL/StGLVec.h>
+
+class StGLMatrix;
+
+/**
+ * GLSL program for rendering textured text.
+ * Font texture is expected to be in alpha format
+ * (either GL_ALPHA8 or GL_R8 when StGLContext::arbTexRG is available).
+ */
+class StGLTextProgram : public StGLProgram {
+
+ public:
+
+ /**
+ * Empty constructor.
+ */
+ ST_CPPEXPORT StGLTextProgram();
+
+ /**
+ * Destructor.
+ */
+ ST_CPPEXPORT virtual ~StGLTextProgram();
+
+ /**
+ * Return vertex position attribute location.
+ */
+ ST_LOCAL StGLVarLocation getVVertexLoc() const { return StGLVarLocation(0); }
+
+ /**
+ * Return vertex texture coordinates attribute location.
+ */
+ ST_LOCAL StGLVarLocation getVTexCoordLoc() const { return StGLVarLocation(1); }
+
+ /**
+ * Setup projection matrix.
+ * @param theCtx active GL context
+ * @param theProjMat projection matrix
+ */
+ ST_CPPEXPORT void setProjMat(StGLContext& theCtx,
+ const StGLMatrix& theProjMat);
+
+ /**
+ * Setup model-view matrix.
+ * @param theCtx active GL context
+ * @param theModelMat model-view matrix
+ */
+ ST_CPPEXPORT void setModelMat(StGLContext& theCtx,
+ const StGLMatrix& theModelMat);
+
+ /**
+ * Setup text color.
+ * @param theCtx active GL context
+ * @param theColor color
+ */
+ ST_CPPEXPORT void setColor(StGLContext& theCtx,
+ const StGLVec4& theColor);
+
+ /**
+ * Initialize program.
+ * @param theCtx active GL context
+ * @return true if no error
+ */
+ ST_CPPEXPORT virtual bool init(StGLContext& theCtx);
+
+ private:
+
+ StGLVarLocation myUniformProjMat; //!< location of uniform variable of projection matrix
+ StGLVarLocation myUniformModelMat; //!< location of uniform variable of model view matrix
+ StGLVarLocation myUniformColor; //!< location of uniform variable of color value
+
+};
+
+#endif // __StGLTextProgram_h_

sview-15_10.tar.gz/include/StGLWidgets/StGLTextureButton.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLTextureButton.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLWidget.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLWidget.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StGLWidgetList.h -> sview-15_11.tar.gz/include/StGLWidgets/StGLWidgetList.h Changed

sview-15_10.tar.gz/include/StGLWidgets/StSubQueue.h -> sview-15_11.tar.gz/include/StGLWidgets/StSubQueue.h Changed

sview-15_10.tar.gz/include/StImage/StImage.h -> sview-15_11.tar.gz/include/StImage/StImage.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2010-2013 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -11,6 +11,40 @@
 
 #include "StImagePlane.h"
 
+/**
+ * Interface to share arbitrary memory buffer using reference counter.
+ */
+class StBufferCounter {
+
+ public:
+
+ /**
+ * Empty constructor.
+ */
+ StBufferCounter() {}
+
+ /**
+ * Create the new reference (e.g. increment counter).
+ * If theOther has the same type, than the ref counter will be reused.
+ * Otherwise then new counter will be allocated.
+ */
+ virtual void createReference(StHandle<StBufferCounter>& theOther) const = 0;
+
+ /**
+ * Release current reference.
+ */
+ virtual void releaseReference() = 0;
+
+ /**
+ * Destructor.
+ */
+ virtual ~StBufferCounter() {}
+
+};
+
+/**
+ * Class defining 2D image consisting from one or more color planes.
+ */
 class StImage {
 
 public: //! @name enumerations
@@ -49,7 +83,8 @@
 /**
 * Initialize as copy (data will be copied!).
 */
- ST_CPPEXPORT bool initCopy(const StImage& theCopy);
+ ST_CPPEXPORT bool initCopy(const StImage& theCopy,
+ const bool theIsCompact);
 
 /**
 * Initialize as wrapper (data will not be copied).
@@ -57,6 +92,17 @@
 ST_CPPEXPORT bool initWrapper(const StImage& theCopy);
 
 /**
+ * Initialize as reference to the shared buffer.
+ */
+ ST_CPPEXPORT bool initReference(const StImage& theCopy);
+
+ /**
+ * Initialize as reference to the shared buffer.
+ */
+ ST_CPPEXPORT bool initReference(const StImage& theCopy,
+ const StHandle<StBufferCounter>& theRef);
+
+ /**
 * Initialize as wrapper of input data in RGB format
 * or tries to convert data to RGB.
 */
@@ -70,7 +116,8 @@
 const int theSeparationDx,
 const int theSeparationDy);
 
- ST_CPPEXPORT bool fill(const StImage& theCopy);
+ ST_CPPEXPORT bool fill(const StImage& theCopy,
+ const bool theIsCompact);
 
 /**
 * Advanced initializer for further scaling - creates an image from specified one with:
@@ -159,6 +206,13 @@
 }
 
 /**
+ * Return true if rows are packed in top-bottom order.
+ */
+ ST_LOCAL bool isTopDown() const {
+ return myPlanes[0].isTopDown();
+ }
+
+ /**
 * @return image width in pixels.
 */
 inline size_t getSizeX() const {
@@ -206,8 +260,21 @@
 */
 ST_CPPEXPORT bool isNull() const;
 
+ /**
+ * Release all color planes and reference counter.
+ */
 ST_CPPEXPORT void nullify();
 
+ /**
+ * Return reference counter for shared memory buffer.
+ */
+ ST_LOCAL const StHandle<StBufferCounter>& getBufferCounter() const { return myBufCounter; }
+
+ /**
+ * Dangerous method to assign reference counter for shared memory buffer.
+ */
+ ST_LOCAL void setBufferCounter(const StHandle<StBufferCounter>& theCounter) { myBufCounter = theCounter; }
+
 protected:
 
 ST_LOCAL inline StString getDescription() const {
@@ -258,6 +325,8 @@
 GLfloat myPAR; //!< pixel aspect ratio
 ImgColorModel myColorModel; //!< color model (RGB/YUV...)
 ImgColorScale myColorScale; //!< color scale (range)
+ StHandle<StBufferCounter>
+ myBufCounter; //!< reference counter for shared memory buffer
 
 };

sview-15_10.tar.gz/include/StImage/StImageFile.h -> sview-15_11.tar.gz/include/StImage/StImageFile.h Changed

@@ -10,6 +10,7 @@
 #define __StImageFile_h_
 
 #include <StTemplates/StHandle.h>
+#include <StStrings/StDictionary.h>
 #include <StGLStereo/StFormatEnum.h>
 
 #include "StImage.h"
@@ -20,6 +21,12 @@
 class StImageFile;
 ST_DEFINE_HANDLE(StImageFile, StImage);
 
+class StImageFileCounter;
+ST_DEFINE_HANDLE(StImageFileCounter, StBufferCounter);
+
+/**
+ * Interface extending StImage with load/save capabilities.
+ */
 class StImageFile : public StImage {
 
 public:
@@ -74,18 +81,32 @@
 /**
 * @return the error description occured on load/save operations.
 */
- inline const StString& getState() const {
+ ST_LOCAL const StString& getState() const {
 return myStateDescr;
 }
 
- inline StString& changeState() {
+ ST_LOCAL StString& changeState() {
 return myStateDescr;
 }
 
- inline void setState(const StString& theDescr = StString()) {
+ ST_LOCAL void setState(const StString& theDescr = StString()) {
 myStateDescr = theDescr;
 }
 
+ /**
+ * Return metadata associated with image.
+ */
+ ST_LOCAL const StDictionary& getMetadata() const {
+ return myMetadata;
+ }
+
+ /**
+ * Assign new metadata.
+ */
+ ST_LOCAL void setMetadata(const StDictionary& theDict) {
+ myMetadata = theDict;
+ }
+
 ST_LOCAL StFormat getFormat() const {
 return mySrcFormat;
 }
@@ -127,8 +148,49 @@
 
 protected:
 
- StString myStateDescr;
- StFormat mySrcFormat;
+ StDictionary myMetadata;
+ StString myStateDescr;
+ StFormat mySrcFormat;
+
+};
+
+/**
+ * Define reference-counted StImageFile buffer for StImage.
+ */
+class StImageFileCounter : public StBufferCounter {
+
+ public:
+
+ /**
+ * Empty constructor.
+ */
+ ST_LOCAL StImageFileCounter() {}
+
+ /**
+ * Main constructor.
+ */
+ ST_LOCAL StImageFileCounter(const StHandle<StImage>& theImage) : myImageFile(theImage) {}
+
+ /**
+ * Create the new reference (e.g. increment counter).
+ * If theOther has the same type, than the ref counter will be reused.
+ * Otherwise then new counter will be allocated.
+ */
+ ST_CPPEXPORT virtual void createReference(StHandle<StBufferCounter>& theOther) const;
+
+ /**
+ * Release current reference.
+ */
+ ST_CPPEXPORT virtual void releaseReference();
+
+ /**
+ * Release reference counter.
+ */
+ ST_CPPEXPORT virtual ~StImageFileCounter();
+
+ private:
+
+ StHandle<StImage> myImageFile;
 
 };

sview-15_10.tar.gz/include/StImage/StImagePlane.h -> sview-15_11.tar.gz/include/StImage/StImagePlane.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2010-2013 Kirill Gavrilov <kirill@sview.ru>
+ * Copyright © 2010-2015 Kirill Gavrilov <kirill@sview.ru>
 *
 * Distributed under the Boost Software License, Version 1.0.
 * See accompanying file license-boost.txt or copy at
@@ -30,8 +30,10 @@
 ImgBGR, //!< same as RGB but with different components order
 ImgRGB32, //!< 4 bytes packed RGB image plane (1 byte is dummy)
 ImgBGR32, //!< same as RGB but with different components order
+ ImgRGB48, //!< 6 bytes packed RGB image plane
 ImgRGBA, //!< 4 bytes packed RGBA image plane
 ImgBGRA, //!< same as RGBA but with different components order
+ ImgRGBA64, //!< 8 bytes packed RGBA image plane
 ImgGrayF, //!< 1 float (4-bytes) per pixel (1-component plane)
 ImgRGBF, //!< 3 floats (12-bytes) RGB image plane
 ImgBGRF, //!< same as RGBF but with different components order
@@ -106,6 +108,14 @@
 return &myDataPtr[mySizeRowBytes * theRow + mySizeBPP * theCol];
 }
 
+ /**
+ * @return data pointer to requested position.
+ */
+ inline GLubyte* accessData(const size_t theRow = 0, const size_t theCol = 0) const {
+ ST_DEBUG_ASSERT((myDataPtr != NULL) && (theRow < mySizeY) && (theCol < mySizeX));
+ return &myDataPtr[mySizeRowBytes * theRow + mySizeBPP * theCol];
+ }
+
 inline GLubyte getFirstByte(const size_t theRow, const size_t theCol) const {
 return *getData(theRow, theCol);
 }
@@ -240,7 +250,8 @@
 /**
 * Initialize as copy (data will be copied!).
 */
- ST_CPPEXPORT bool initCopy(const StImagePlane& theCopy);
+ ST_CPPEXPORT bool initCopy(const StImagePlane& theCopy,
+ const bool theIsCompact);
 
 /**
 * Initialize as wrapper (data will not be copied).
@@ -256,7 +267,8 @@
 const int theSeparationDy = 0,
 const int theValue = 0);
 
- ST_CPPEXPORT bool fill(const StImagePlane& theCopy);
+ ST_CPPEXPORT bool fill(const StImagePlane& theCopy,
+ const bool theIsCompact);
 
 /**
 * Smart method to correctly deallocate image plane.

sview-15_10.tar.gz/include/StThreads/StCondition.h -> sview-15_11.tar.gz/include/StThreads/StCondition.h Changed

sview-15_10.tar.gz/include/StThreads/StResourceManager.h -> sview-15_11.tar.gz/include/StThreads/StResourceManager.h Changed

sview-15_11.tar.gz/license-CC-BY-4.0.txt Added

@@ -0,0 +1,393 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.

sview-15_10.tar.gz/sview/AndroidManifest.xml -> sview-15_11.tar.gz/sview/AndroidManifest.xml Changed

@@ -1,51 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 package="com.sview"
- android:versionCode="8"
- android:versionName="15.10">
+ android:versionCode="10"
+ android:versionName="15.11">
 <application android:label="@string/app_name"
 android:hasCode="true"
 android:icon="@drawable/ic_launcher">
- 
- 
- <activity android:name="com.sview.StImageActivity"
- android:label="@string/app_image_name"
- android:launchMode="singleTask"
- android:configChanges="orientation|keyboardHidden|screenSize"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
- 
- 
- <meta-data android:name="android.app.lib_name" android:value="sview" />
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="application/vnd.google.panorama360+jpg"/>
- <data android:mimeType="image/*"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
-
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
-
- <data android:scheme="" />
- <data android:scheme="file" />
- <data android:scheme="ftp" />
- <data android:scheme="content" />
- <data android:scheme="http" />
- <data android:scheme="https" />
- <data android:host="*" />
-
- <data android:pathPattern=".*\\.mpo" />
- <data android:pathPattern=".*\\.jps" />
- <data android:pathPattern=".*\\.pns" />
- <data android:pathPattern=".*\\.webp" />
- </intent-filter>
- </activity>
 
 <activity android:name="com.sview.StMovieActivity"
 android:label="@string/app_movie_name"
@@ -191,13 +151,51 @@
 <data android:pathPattern=".*\\.WMA" />
 </intent-filter>
 </activity>
+ 
+ <activity android:name="com.sview.StImageActivity"
+ android:label="@string/app_image_name"
+ android:launchMode="singleTask"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+ 
+ 
+ <meta-data android:name="android.app.lib_name" android:value="sview" />
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:mimeType="application/vnd.google.panorama360+jpg"/>
+ <data android:mimeType="image/*"/>
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+
+ <data android:scheme="" />
+ <data android:scheme="file" />
+ <data android:scheme="ftp" />
+ <data android:scheme="content" />
+ <data android:scheme="http" />
+ <data android:scheme="https" />
+ <data android:host="*" />
+
+ <data android:pathPattern=".*\\.mpo" />
+ <data android:pathPattern=".*\\.jps" />
+ <data android:pathPattern=".*\\.pns" />
+ <data android:pathPattern=".*\\.webp" />
+ </intent-filter>
+ </activity>
 
 </application>
 
 <uses-sdk android:minSdkVersion="15" />
 <uses-feature android:glEsVersion="0x00020000"/>
 <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

sview-15_10.tar.gz/sview/StMultiApp.cpp -> sview-15_11.tar.gz/sview/StMultiApp.cpp Changed

@@ -21,6 +21,13 @@
 + "Usage: sView [options] - file\n"
 + "Available options:\n"
 " --fullscreen Open fullscreen\n"
+ " --toShowMenu=off Hide main menu\n"
+ " --toShowTopbar=off Hide top toolbar\n"
+ " --monitorId=ID open window on specified monitor\n"
+ " --windowLeft=L window left position\n"
+ " --windowTop=T window top position\n"
+ " --windowWidth=W window width position\n"
+ " --windowHeight=H window height position\n"
 " --slideshow Start slideshow\n"
 " --last Open last file\n"
 " --paused Open file in paused state\n"
@@ -40,7 +47,18 @@
 + st::formatToString(StFormat_Rows) + ", "
 + st::formatToString(StFormat_FrameSequence) + "\n"
 + " --left=PATH Specify source for left view\n"
- " --right=PATH Specify source for right view\n";
+ " --right=PATH Specify source for right view\n"
+ " --webuiCmdPort=PORT Use http://localhost:PORT for remote control (see --invokeAction).\n"
+ " --invokeAction=ACT Invoke action on http://localhost:PORT.\n"
+ " play - play/pause\n"
+ " mute - mute/unmute audio\n"
+ " vol?VOLUME - specify volume in percents\n"
+ " prev,next - play previous/next item in playlist\n"
+ " fastbwd,fastfwd - seek backward/forward\n"
+ " quit - close the program\n"
+ " current?title - print title of currently played item\n"
+ " fullscreen - switch fullscreen/windowed.\n"
+ " The full list also includes actions having hot-keys";
 return anAboutString;
 }
 
@@ -59,7 +77,72 @@
 return NULL;
 }
 
+ // command interface
 const StArgumentsMap anArgs = anInfo->getArgumentsMap();
+ StArgument anArgCmd = anArgs["invokeAction"];
+ StArgument anArgCmd2 = anArgs["action"];
+ StString anAction;
+ if(anArgCmd2.isValid()) {
+ anAction = anArgCmd2.getValue();
+ }
+ if(anArgCmd.isValid()) {
+ anAction = anArgCmd.getValue();
+ }
+ if(!anAction.isEmpty()) {
+ StString anActLow = anAction;
+ anActLow.toLowerCase();
+ if(anActLow == "play"
+ || anActLow == "pause") {
+ anAction = "play_pause";
+ } else if(anActLow == "stop") {
+ anAction = "stop";
+ } else if(anActLow == "mute") {
+ anAction = "mute";
+ } else if(anActLow == "next"
+ || anActLow == "nextitem") {
+ anAction = "next";
+ } else if(anActLow == "prev"
+ || anActLow == "previous"
+ || anActLow == "previtem") {
+ anAction = "prev";
+ } else if(anActLow == "currentid") {
+ anAction = "current?id";
+ } else if(anActLow == "currenttitle") {
+ anAction = "current?title";
+ } else if(anAction.isContains('?')) {
+ anAction = anAction;
+ } else if(anActLow == "fastbwd") {
+ anAction = "action?DoSeekLeft";
+ } else if(anActLow == "fastfwd") {
+ anAction = "action?DoSeekRight";
+ } else if(anActLow == "quit"
+ || anActLow == "exit") {
+ anAction = "action?DoQuit";
+ } else if(anActLow == "mono") {
+ anAction = "action?DoSrcMono";
+ } else if(anActLow == "overunder") {
+ anAction = "action?DoSrcOverUnder";
+ } else if(anActLow == "sidebyside") {
+ anAction = "action?DoSrcSideBySide";
+ } else if(anActLow == "fullscreen") {
+ anAction = "action?DoFullscreen";
+ } else {
+ anAction = StString("action?") + anAction;
+ }
+ }
+ if(!anAction.isEmpty()) {
+ StArgument anArgCmdPort = anArgs["webuiCmdPort"];
+ StString aPort = "8080";
+ if(anArgCmdPort.isValid()) {
+ aPort = anArgCmdPort.getValue();
+ }
+ StString anUrl = StString("http://localhost:") + aPort + "/" + anAction;
+ StString aResponse = StRawFile::readTextFile(anUrl);
+ st::cout << aResponse << "\n";
+ return NULL;
+ }
+
+ // select application
 const StString ARGUMENT_DRAWER = "in";
 StArgument anArgDrawer = anArgs[ARGUMENT_DRAWER];
 if(anArgDrawer.isValid()) {

sview-15_10.tar.gz/sview/jni/main.cpp -> sview-15_11.tar.gz/sview/jni/main.cpp Changed

@@ -32,6 +32,19 @@
 }
 
 /**
+ * Determine StApplication class from file extension.
+ */
+ ST_LOCAL static StString getStAppClassFromExtension(const StString& theExtension) {
+ const StMIMEList aMimeImg(ST_IMAGE_PLUGIN_MIME_CHAR);
+ for(size_t aMimeIter = 0; aMimeIter < aMimeImg.size(); ++aMimeIter) {
+ if(theExtension.isEqualsIgnoreCase(aMimeImg[aMimeIter].getExtension())) {
+ return "image";
+ }
+ }
+ return "video";
+ }
+
+ /**
 * Choose and instantiate StApplication.
 */
 ST_LOCAL virtual void createApplication() override {
@@ -43,19 +56,32 @@
 myDndPath.clear();
 
 StHandle<StResourceManager> aResMgr = new StResourceManager(myActivity->assetManager);
+ aResMgr->setFolder(StResourceManager::FolderId_SdCard,
+ getStoragePath(myThJniEnv, "sdcard"));
+ aResMgr->setFolder(StResourceManager::FolderId_Downloads,
+ getStoragePath(myThJniEnv, "Download"));
+ aResMgr->setFolder(StResourceManager::FolderId_Pictures,
+ getStoragePath(myThJniEnv, "Pictures"));
+ aResMgr->setFolder(StResourceManager::FolderId_Photos,
+ getStoragePath(myThJniEnv, "DCIM"));
+ aResMgr->setFolder(StResourceManager::FolderId_Music,
+ getStoragePath(myThJniEnv, "Music"));
+ aResMgr->setFolder(StResourceManager::FolderId_Videos,
+ getStoragePath(myThJniEnv, "Movies"));
+
+ if(myStAppClass.isEmpty()) {
+ myStAppClass = getStAppClassFromExtension(aFileExtension);
+ }
 
- const StMIMEList aMimeImg(ST_IMAGE_PLUGIN_MIME_CHAR);
- for(size_t aMimeIter = 0; aMimeIter < aMimeImg.size(); ++aMimeIter) {
- if(aFileExtension.isEqualsIgnoreCase(aMimeImg[aMimeIter].getExtension())) {
- StArgumentsMap anArgs = anInfo->getArgumentsMap();
- if(anInfo->isEmpty()) {
- anArgs.set(StDictEntry("last", "true"));
- }
- anArgs.set(StDictEntry("toSaveRecent","true"));
- anInfo->setArgumentsMap(anArgs);
- myApp = new StImageViewer(aResMgr, this, anInfo);
- return;
+ if(myStAppClass == "image") {
+ StArgumentsMap anArgs = anInfo->getArgumentsMap();
+ if(anInfo->isEmpty()) {
+ anArgs.set(StDictEntry("last", "true"));
 }
+ anArgs.set(StDictEntry("toSaveRecent","true"));
+ anInfo->setArgumentsMap(anArgs);
+ myApp = new StImageViewer(aResMgr, this, anInfo);
+ return;
 }
 
 if(anInfo->isEmpty()) {

sview-15_10.tar.gz/sview/src/com/sview/StActivity.java -> sview-15_11.tar.gz/sview/src/com/sview/StActivity.java Changed

sview-15_10.tar.gz/sview/src/com/sview/StImageActivity.java -> sview-15_11.tar.gz/sview/src/com/sview/StImageActivity.java Changed

sview-15_10.tar.gz/sview/src/com/sview/StMovieActivity.java -> sview-15_11.tar.gz/sview/src/com/sview/StMovieActivity.java Changed

sview-15_10.tar.gz/sview/sview.cbp -> sview-15_11.tar.gz/sview/sview.cbp Changed

@@ -6,32 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="WIN_gcc_x86">
-				<Option output="../bin/$(TARGET_NAME)/sView" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../bin/$(TARGET_NAME)/" />
-				<Option object_output="obj/$(TARGET_NAME)/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="demo.jps" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++0x" />
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-mmmx" />
-					<Add option="-msse" />
-					<Add option="-DUNICODE" />
-					<Add option="-DST_DEBUG" />
-					<Add option="-DST_HAVE_STCONFIG" />
-				</Compiler>
-				<Linker>
-					<Add library="gdi32" />
-					<Add library="user32" />
-					<Add library="kernel32" />
-					<Add library="Comdlg32" />
-					<Add library="Version" />
-				</Linker>
-			</Target>
 			<Target title="WIN_vc_x86">
 				<Option output="../bin/$(TARGET_NAME)/sView" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
@@ -63,12 +37,12 @@
 					<Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /manifest &quot;..\dpiAware.manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;1' />
 				</ExtraCommands>
 			</Target>
-			<Target title="WIN_vc_x86_DEBUG">
+			<Target title="WIN_vc_AMD64_DEBUG">
 				<Option output="../bin/$(TARGET_NAME)/sView" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../bin/$(TARGET_NAME)/" />
 				<Option object_output="obj/$(TARGET_NAME)/" />
 				<Option type="1" />
-				<Option compiler="msvc10" />
+				<Option compiler="windows_sdk_x86_64" />
 				<Option parameters="demo.jps" />
 				<Compiler>
 					<Add option="/MDd" />
@@ -280,9 +254,8 @@
 		<Unit filename="StMultiApp.cpp" />
 		<Unit filename="StMultiApp.h" />
 		<Unit filename="main.cpp">
-			<Option target="WIN_gcc_x86" />
 			<Option target="WIN_vc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 			<Option target="WIN_vc_AMD64" />
 			<Option target="LINUX_gcc" />
 			<Option target="LINUX_gcc_DEBUG" />
@@ -298,8 +271,7 @@
 			<Option compilerVar="WINDRES" />
 			<Option target="WIN_vc_x86" />
 			<Option target="WIN_vc_AMD64" />
-			<Option target="WIN_gcc_x86" />
-			<Option target="WIN_vc_x86_DEBUG" />
+			<Option target="WIN_vc_AMD64_DEBUG" />
 		</Unit>
 		<Extensions>
 			<code_completion />

sview-15_10.tar.gz/textures/menuAuto128.png -> sview-15_11.tar.gz/textures/menuAuto128.png Changed

sview-15_10.tar.gz/textures/menuAuto144.png -> sview-15_11.tar.gz/textures/menuAuto144.png Changed

sview-15_10.tar.gz/textures/menuAuto16.png -> sview-15_11.tar.gz/textures/menuAuto16.png Changed

sview-15_10.tar.gz/textures/menuAuto192.png -> sview-15_11.tar.gz/textures/menuAuto192.png Changed

sview-15_10.tar.gz/textures/menuAuto24.png -> sview-15_11.tar.gz/textures/menuAuto24.png Changed

sview-15_10.tar.gz/textures/menuAuto256.png -> sview-15_11.tar.gz/textures/menuAuto256.png Changed

sview-15_10.tar.gz/textures/menuAuto32.png -> sview-15_11.tar.gz/textures/menuAuto32.png Changed

sview-15_10.tar.gz/textures/menuAuto48.png -> sview-15_11.tar.gz/textures/menuAuto48.png Changed

sview-15_10.tar.gz/textures/menuAuto64.png -> sview-15_11.tar.gz/textures/menuAuto64.png Changed

sview-15_10.tar.gz/textures/menuAuto72.png -> sview-15_11.tar.gz/textures/menuAuto72.png Changed

sview-15_10.tar.gz/textures/menuAuto96.png -> sview-15_11.tar.gz/textures/menuAuto96.png Changed

sview-15_10.tar.gz/textures/menuDual128.png -> sview-15_11.tar.gz/textures/menuDual128.png Changed

sview-15_10.tar.gz/textures/menuDual144.png -> sview-15_11.tar.gz/textures/menuDual144.png Changed

sview-15_10.tar.gz/textures/menuDual16.png -> sview-15_11.tar.gz/textures/menuDual16.png Changed

sview-15_10.tar.gz/textures/menuDual192.png -> sview-15_11.tar.gz/textures/menuDual192.png Changed

sview-15_10.tar.gz/textures/menuDual24.png -> sview-15_11.tar.gz/textures/menuDual24.png Changed

sview-15_10.tar.gz/textures/menuDual256.png -> sview-15_11.tar.gz/textures/menuDual256.png Changed

sview-15_10.tar.gz/textures/menuDual32.png -> sview-15_11.tar.gz/textures/menuDual32.png Changed

sview-15_10.tar.gz/textures/menuDual48.png -> sview-15_11.tar.gz/textures/menuDual48.png Changed

sview-15_10.tar.gz/textures/menuDual64.png -> sview-15_11.tar.gz/textures/menuDual64.png Changed

sview-15_10.tar.gz/textures/menuDual72.png -> sview-15_11.tar.gz/textures/menuDual72.png Changed

sview-15_10.tar.gz/textures/menuDual96.png -> sview-15_11.tar.gz/textures/menuDual96.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR128.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR128.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR144.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR144.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR16.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR16.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR192.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR192.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR24.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR24.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR256.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR256.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR32.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR32.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR48.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR48.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR64.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR64.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR72.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR72.png Changed

sview-15_10.tar.gz/textures/menuFrameSeqLR96.png -> sview-15_11.tar.gz/textures/menuFrameSeqLR96.png Changed

sview-15_10.tar.gz/textures/menuMono128.png -> sview-15_11.tar.gz/textures/menuMono128.png Changed

sview-15_10.tar.gz/textures/menuMono144.png -> sview-15_11.tar.gz/textures/menuMono144.png Changed

sview-15_10.tar.gz/textures/menuMono16.png -> sview-15_11.tar.gz/textures/menuMono16.png Changed

sview-15_10.tar.gz/textures/menuMono192.png -> sview-15_11.tar.gz/textures/menuMono192.png Changed

sview-15_10.tar.gz/textures/menuMono24.png -> sview-15_11.tar.gz/textures/menuMono24.png Changed

sview-15_10.tar.gz/textures/menuMono256.png -> sview-15_11.tar.gz/textures/menuMono256.png Changed

sview-15_10.tar.gz/textures/menuMono32.png -> sview-15_11.tar.gz/textures/menuMono32.png Changed

sview-15_10.tar.gz/textures/menuMono48.png -> sview-15_11.tar.gz/textures/menuMono48.png Changed

sview-15_10.tar.gz/textures/menuMono64.png -> sview-15_11.tar.gz/textures/menuMono64.png Changed

sview-15_10.tar.gz/textures/menuMono72.png -> sview-15_11.tar.gz/textures/menuMono72.png Changed

sview-15_10.tar.gz/textures/menuMono96.png -> sview-15_11.tar.gz/textures/menuMono96.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR128.png -> sview-15_11.tar.gz/textures/menuOverUnderLR128.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR144.png -> sview-15_11.tar.gz/textures/menuOverUnderLR144.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR16.png -> sview-15_11.tar.gz/textures/menuOverUnderLR16.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR192.png -> sview-15_11.tar.gz/textures/menuOverUnderLR192.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR24.png -> sview-15_11.tar.gz/textures/menuOverUnderLR24.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR256.png -> sview-15_11.tar.gz/textures/menuOverUnderLR256.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR32.png -> sview-15_11.tar.gz/textures/menuOverUnderLR32.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR48.png -> sview-15_11.tar.gz/textures/menuOverUnderLR48.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR64.png -> sview-15_11.tar.gz/textures/menuOverUnderLR64.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR72.png -> sview-15_11.tar.gz/textures/menuOverUnderLR72.png Changed

sview-15_10.tar.gz/textures/menuOverUnderLR96.png -> sview-15_11.tar.gz/textures/menuOverUnderLR96.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL128.png -> sview-15_11.tar.gz/textures/menuOverUnderRL128.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL144.png -> sview-15_11.tar.gz/textures/menuOverUnderRL144.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL16.png -> sview-15_11.tar.gz/textures/menuOverUnderRL16.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL192.png -> sview-15_11.tar.gz/textures/menuOverUnderRL192.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL24.png -> sview-15_11.tar.gz/textures/menuOverUnderRL24.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL256.png -> sview-15_11.tar.gz/textures/menuOverUnderRL256.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL32.png -> sview-15_11.tar.gz/textures/menuOverUnderRL32.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL48.png -> sview-15_11.tar.gz/textures/menuOverUnderRL48.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL64.png -> sview-15_11.tar.gz/textures/menuOverUnderRL64.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL72.png -> sview-15_11.tar.gz/textures/menuOverUnderRL72.png Changed

sview-15_10.tar.gz/textures/menuOverUnderRL96.png -> sview-15_11.tar.gz/textures/menuOverUnderRL96.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_128.png -> sview-15_11.tar.gz/textures/menuRatio16_10_128.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_144.png -> sview-15_11.tar.gz/textures/menuRatio16_10_144.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_16.png -> sview-15_11.tar.gz/textures/menuRatio16_10_16.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_192.png -> sview-15_11.tar.gz/textures/menuRatio16_10_192.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_24.png -> sview-15_11.tar.gz/textures/menuRatio16_10_24.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_256.png -> sview-15_11.tar.gz/textures/menuRatio16_10_256.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_32.png -> sview-15_11.tar.gz/textures/menuRatio16_10_32.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_48.png -> sview-15_11.tar.gz/textures/menuRatio16_10_48.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_64.png -> sview-15_11.tar.gz/textures/menuRatio16_10_64.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_72.png -> sview-15_11.tar.gz/textures/menuRatio16_10_72.png Changed

sview-15_10.tar.gz/textures/menuRatio16_10_96.png -> sview-15_11.tar.gz/textures/menuRatio16_10_96.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_128.png -> sview-15_11.tar.gz/textures/menuRatio16_9_128.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_144.png -> sview-15_11.tar.gz/textures/menuRatio16_9_144.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_16.png -> sview-15_11.tar.gz/textures/menuRatio16_9_16.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_192.png -> sview-15_11.tar.gz/textures/menuRatio16_9_192.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_24.png -> sview-15_11.tar.gz/textures/menuRatio16_9_24.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_256.png -> sview-15_11.tar.gz/textures/menuRatio16_9_256.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_32.png -> sview-15_11.tar.gz/textures/menuRatio16_9_32.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_48.png -> sview-15_11.tar.gz/textures/menuRatio16_9_48.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_64.png -> sview-15_11.tar.gz/textures/menuRatio16_9_64.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_72.png -> sview-15_11.tar.gz/textures/menuRatio16_9_72.png Changed

sview-15_10.tar.gz/textures/menuRatio16_9_96.png -> sview-15_11.tar.gz/textures/menuRatio16_9_96.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_128.png -> sview-15_11.tar.gz/textures/menuRatio1_1_128.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_144.png -> sview-15_11.tar.gz/textures/menuRatio1_1_144.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_16.png -> sview-15_11.tar.gz/textures/menuRatio1_1_16.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_192.png -> sview-15_11.tar.gz/textures/menuRatio1_1_192.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_24.png -> sview-15_11.tar.gz/textures/menuRatio1_1_24.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_256.png -> sview-15_11.tar.gz/textures/menuRatio1_1_256.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_32.png -> sview-15_11.tar.gz/textures/menuRatio1_1_32.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_48.png -> sview-15_11.tar.gz/textures/menuRatio1_1_48.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_64.png -> sview-15_11.tar.gz/textures/menuRatio1_1_64.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_72.png -> sview-15_11.tar.gz/textures/menuRatio1_1_72.png Changed

sview-15_10.tar.gz/textures/menuRatio1_1_96.png -> sview-15_11.tar.gz/textures/menuRatio1_1_96.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_128.png -> sview-15_11.tar.gz/textures/menuRatio2_1_128.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_144.png -> sview-15_11.tar.gz/textures/menuRatio2_1_144.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_16.png -> sview-15_11.tar.gz/textures/menuRatio2_1_16.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_192.png -> sview-15_11.tar.gz/textures/menuRatio2_1_192.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_24.png -> sview-15_11.tar.gz/textures/menuRatio2_1_24.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_256.png -> sview-15_11.tar.gz/textures/menuRatio2_1_256.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_32.png -> sview-15_11.tar.gz/textures/menuRatio2_1_32.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_48.png -> sview-15_11.tar.gz/textures/menuRatio2_1_48.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_64.png -> sview-15_11.tar.gz/textures/menuRatio2_1_64.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_72.png -> sview-15_11.tar.gz/textures/menuRatio2_1_72.png Changed

sview-15_10.tar.gz/textures/menuRatio2_1_96.png -> sview-15_11.tar.gz/textures/menuRatio2_1_96.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_128.png -> sview-15_11.tar.gz/textures/menuRatio4_3_128.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_144.png -> sview-15_11.tar.gz/textures/menuRatio4_3_144.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_16.png -> sview-15_11.tar.gz/textures/menuRatio4_3_16.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_192.png -> sview-15_11.tar.gz/textures/menuRatio4_3_192.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_24.png -> sview-15_11.tar.gz/textures/menuRatio4_3_24.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_256.png -> sview-15_11.tar.gz/textures/menuRatio4_3_256.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_32.png -> sview-15_11.tar.gz/textures/menuRatio4_3_32.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_48.png -> sview-15_11.tar.gz/textures/menuRatio4_3_48.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_64.png -> sview-15_11.tar.gz/textures/menuRatio4_3_64.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_72.png -> sview-15_11.tar.gz/textures/menuRatio4_3_72.png Changed

sview-15_10.tar.gz/textures/menuRatio4_3_96.png -> sview-15_11.tar.gz/textures/menuRatio4_3_96.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_128.png -> sview-15_11.tar.gz/textures/menuRatio5_4_128.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_144.png -> sview-15_11.tar.gz/textures/menuRatio5_4_144.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_16.png -> sview-15_11.tar.gz/textures/menuRatio5_4_16.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_192.png -> sview-15_11.tar.gz/textures/menuRatio5_4_192.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_24.png -> sview-15_11.tar.gz/textures/menuRatio5_4_24.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_256.png -> sview-15_11.tar.gz/textures/menuRatio5_4_256.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_32.png -> sview-15_11.tar.gz/textures/menuRatio5_4_32.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_48.png -> sview-15_11.tar.gz/textures/menuRatio5_4_48.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_64.png -> sview-15_11.tar.gz/textures/menuRatio5_4_64.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_72.png -> sview-15_11.tar.gz/textures/menuRatio5_4_72.png Changed

sview-15_10.tar.gz/textures/menuRatio5_4_96.png -> sview-15_11.tar.gz/textures/menuRatio5_4_96.png Changed

sview-15_10.tar.gz/textures/menuRowLR128.png -> sview-15_11.tar.gz/textures/menuRowLR128.png Changed

sview-15_10.tar.gz/textures/menuRowLR144.png -> sview-15_11.tar.gz/textures/menuRowLR144.png Changed

sview-15_10.tar.gz/textures/menuRowLR16.png -> sview-15_11.tar.gz/textures/menuRowLR16.png Changed

sview-15_10.tar.gz/textures/menuRowLR192.png -> sview-15_11.tar.gz/textures/menuRowLR192.png Changed

sview-15_10.tar.gz/textures/menuRowLR24.png -> sview-15_11.tar.gz/textures/menuRowLR24.png Changed

sview-15_10.tar.gz/textures/menuRowLR256.png -> sview-15_11.tar.gz/textures/menuRowLR256.png Changed

sview-15_10.tar.gz/textures/menuRowLR32.png -> sview-15_11.tar.gz/textures/menuRowLR32.png Changed

sview-15_10.tar.gz/textures/menuRowLR48.png -> sview-15_11.tar.gz/textures/menuRowLR48.png Changed

sview-15_10.tar.gz/textures/menuRowLR64.png -> sview-15_11.tar.gz/textures/menuRowLR64.png Changed

sview-15_10.tar.gz/textures/menuRowLR72.png -> sview-15_11.tar.gz/textures/menuRowLR72.png Changed

sview-15_10.tar.gz/textures/menuRowLR96.png -> sview-15_11.tar.gz/textures/menuRowLR96.png Changed

sview-15_10.tar.gz/textures/menuRowRL128.png -> sview-15_11.tar.gz/textures/menuRowRL128.png Changed

sview-15_10.tar.gz/textures/menuRowRL144.png -> sview-15_11.tar.gz/textures/menuRowRL144.png Changed

sview-15_10.tar.gz/textures/menuRowRL16.png -> sview-15_11.tar.gz/textures/menuRowRL16.png Changed

sview-15_10.tar.gz/textures/menuRowRL192.png -> sview-15_11.tar.gz/textures/menuRowRL192.png Changed

sview-15_10.tar.gz/textures/menuRowRL24.png -> sview-15_11.tar.gz/textures/menuRowRL24.png Changed

sview-15_10.tar.gz/textures/menuRowRL256.png -> sview-15_11.tar.gz/textures/menuRowRL256.png Changed

sview-15_10.tar.gz/textures/menuRowRL32.png -> sview-15_11.tar.gz/textures/menuRowRL32.png Changed

sview-15_10.tar.gz/textures/menuRowRL48.png -> sview-15_11.tar.gz/textures/menuRowRL48.png Changed

sview-15_10.tar.gz/textures/menuRowRL64.png -> sview-15_11.tar.gz/textures/menuRowRL64.png Changed

sview-15_10.tar.gz/textures/menuRowRL72.png -> sview-15_11.tar.gz/textures/menuRowRL72.png Changed

sview-15_10.tar.gz/textures/menuRowRL96.png -> sview-15_11.tar.gz/textures/menuRowRL96.png Changed

sview-15_10.tar.gz/textures/menuSbsLR128.png -> sview-15_11.tar.gz/textures/menuSbsLR128.png Changed

sview-15_10.tar.gz/textures/menuSbsLR144.png -> sview-15_11.tar.gz/textures/menuSbsLR144.png Changed

sview-15_10.tar.gz/textures/menuSbsLR16.png -> sview-15_11.tar.gz/textures/menuSbsLR16.png Changed

sview-15_10.tar.gz/textures/menuSbsLR192.png -> sview-15_11.tar.gz/textures/menuSbsLR192.png Changed

sview-15_10.tar.gz/textures/menuSbsLR24.png -> sview-15_11.tar.gz/textures/menuSbsLR24.png Changed

sview-15_10.tar.gz/textures/menuSbsLR256.png -> sview-15_11.tar.gz/textures/menuSbsLR256.png Changed

sview-15_10.tar.gz/textures/menuSbsLR32.png -> sview-15_11.tar.gz/textures/menuSbsLR32.png Changed

sview-15_10.tar.gz/textures/menuSbsLR48.png -> sview-15_11.tar.gz/textures/menuSbsLR48.png Changed

sview-15_10.tar.gz/textures/menuSbsLR64.png -> sview-15_11.tar.gz/textures/menuSbsLR64.png Changed

sview-15_10.tar.gz/textures/menuSbsLR72.png -> sview-15_11.tar.gz/textures/menuSbsLR72.png Changed

sview-15_10.tar.gz/textures/menuSbsLR96.png -> sview-15_11.tar.gz/textures/menuSbsLR96.png Changed

sview-15_10.tar.gz/textures/menuSbsRL128.png -> sview-15_11.tar.gz/textures/menuSbsRL128.png Changed

sview-15_10.tar.gz/textures/menuSbsRL144.png -> sview-15_11.tar.gz/textures/menuSbsRL144.png Changed

sview-15_10.tar.gz/textures/menuSbsRL16.png -> sview-15_11.tar.gz/textures/menuSbsRL16.png Changed

sview-15_10.tar.gz/textures/menuSbsRL192.png -> sview-15_11.tar.gz/textures/menuSbsRL192.png Changed

sview-15_10.tar.gz/textures/menuSbsRL24.png -> sview-15_11.tar.gz/textures/menuSbsRL24.png Changed

sview-15_10.tar.gz/textures/menuSbsRL256.png -> sview-15_11.tar.gz/textures/menuSbsRL256.png Changed

sview-15_10.tar.gz/textures/menuSbsRL32.png -> sview-15_11.tar.gz/textures/menuSbsRL32.png Changed

sview-15_10.tar.gz/textures/menuSbsRL48.png -> sview-15_11.tar.gz/textures/menuSbsRL48.png Changed

sview-15_10.tar.gz/textures/menuSbsRL64.png -> sview-15_11.tar.gz/textures/menuSbsRL64.png Changed

sview-15_10.tar.gz/textures/menuSbsRL72.png -> sview-15_11.tar.gz/textures/menuSbsRL72.png Changed

sview-15_10.tar.gz/textures/menuSbsRL96.png -> sview-15_11.tar.gz/textures/menuSbsRL96.png Changed

sview-15_10.tar.gz/textures/menuTiledLR128.png -> sview-15_11.tar.gz/textures/menuTiledLR128.png Changed

sview-15_10.tar.gz/textures/menuTiledLR144.png -> sview-15_11.tar.gz/textures/menuTiledLR144.png Changed

sview-15_10.tar.gz/textures/menuTiledLR16.png -> sview-15_11.tar.gz/textures/menuTiledLR16.png Changed

sview-15_10.tar.gz/textures/menuTiledLR192.png -> sview-15_11.tar.gz/textures/menuTiledLR192.png Changed

sview-15_10.tar.gz/textures/menuTiledLR24.png -> sview-15_11.tar.gz/textures/menuTiledLR24.png Changed

sview-15_10.tar.gz/textures/menuTiledLR256.png -> sview-15_11.tar.gz/textures/menuTiledLR256.png Changed

sview-15_10.tar.gz/textures/menuTiledLR32.png -> sview-15_11.tar.gz/textures/menuTiledLR32.png Changed

sview-15_10.tar.gz/textures/menuTiledLR48.png -> sview-15_11.tar.gz/textures/menuTiledLR48.png Changed

sview-15_10.tar.gz/textures/menuTiledLR64.png -> sview-15_11.tar.gz/textures/menuTiledLR64.png Changed

sview-15_10.tar.gz/textures/menuTiledLR72.png -> sview-15_11.tar.gz/textures/menuTiledLR72.png Changed

sview-15_10.tar.gz/textures/menuTiledLR96.png -> sview-15_11.tar.gz/textures/menuTiledLR96.png Changed

sview-15_11.tar.gz/texturesSrc/export.sh Added

sview-15_10.tar.gz/texturesSrc/menuRatio.svg -> sview-15_11.tar.gz/texturesSrc/menuRatio.svg Changed

@@ -7,217 +7,34 @@
 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 xmlns:svg="http://www.w3.org/2000/svg"
 xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
 width="16"
 height="16"
 id="svg2"
 version="1.1"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.91 r13725"
 sodipodi:docname="menuRatio.svg"
 inkscape:export-filename="menuRatio1_1_16.png"
 inkscape:export-xdpi="90"
 inkscape:export-ydpi="90">
 <defs
- id="defs4">
- <linearGradient
- id="linearGradient4713">
- <stop
- id="stop4715"
- offset="0"
- style="stop-color:#000000;stop-opacity:0;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.46642813"
- id="stop4717" />
- <stop
- id="stop4719"
- offset="0.47303236"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop4721"
- offset="1"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4634">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4636" />
- <stop
- id="stop4642"
- offset="0.46642813"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.47303236"
- id="stop4644" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4638" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4634"
- id="linearGradient4640"
- x1="10.176364"
- y1="7.4030485"
- x2="14.850094"
- y2="7.4030485"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4634-3"
- id="linearGradient4640-7"
- x1="10.176364"
- y1="7.4030485"
- x2="14.850094"
- y2="7.4030485"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4634-3">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4636-4" />
- <stop
- id="stop4642-5"
- offset="0.46642813"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.47303236"
- id="stop4644-5" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4638-7" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4634-3"
- id="linearGradient4662"
- x1="10.176364"
- y1="7.4030485"
- x2="14.850094"
- y2="7.4030485"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4664">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4666" />
- <stop
- id="stop4668"
- offset="0.46642813"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.47303236"
- id="stop4670" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4672" />
- </linearGradient>
- <linearGradient
- gradientTransform="translate(-10.601134,6.9138058)"
- y2="7.4030485"
- x2="14.850094"
- y1="7.4030485"
- x1="10.176364"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4676"
- xlink:href="#linearGradient4713"
- inkscape:collect="always" />
- <linearGradient
- gradientTransform="translate(-9.1593698,6.9138058)"
- y2="7.4030485"
- x2="14.850094"
- y1="7.4030485"
- x1="10.176364"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4676-8"
- xlink:href="#linearGradient4713-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient4713-2">
- <stop
- id="stop4715-9"
- offset="0"
- style="stop-color:#000000;stop-opacity:0;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.46642813"
- id="stop4717-9" />
- <stop
- id="stop4719-2"
- offset="0.47303236"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop4721-1"
- offset="1"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- gradientTransform="translate(-9.1593698,6.9138058)"
- y2="7.4030485"
- x2="14.850094"
- y1="7.4030485"
- x1="10.176364"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4757"
- xlink:href="#linearGradient4713-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient4759">
- <stop
- id="stop4761"
- offset="0"
- style="stop-color:#000000;stop-opacity:0;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.46642813"
- id="stop4763" />
- <stop
- id="stop4765"
- offset="0.47303236"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop4767"
- offset="1"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- y2="7.4030485"
- x2="14.850094"
- y1="7.4030485"
- x1="10.176364"
- gradientTransform="translate(-7.0215298,3.6524912)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4771"
- xlink:href="#linearGradient4713-2"
- inkscape:collect="always" />
- </defs>
+ id="defs4" />
 <sodipodi:namedview
 id="base"
 pagecolor="#ffffff"
 bordercolor="#666666"
 borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="1"
 inkscape:pageshadow="2"
- inkscape:zoom="11.313708"
- inkscape:cx="12.402148"
- inkscape:cy="9.1510743"
+ inkscape:zoom="31.999999"
+ inkscape:cx="10.632593"
+ inkscape:cy="4.9924404"
 inkscape:document-units="px"
- inkscape:current-layer="g3161"
+ inkscape:current-layer="g3169"
 showgrid="false"
- inkscape:window-width="1920"
- inkscape:window-height="1109"
+ inkscape:window-width="2560"
+ inkscape:window-height="1407"
 inkscape:window-x="0"
 inkscape:window-y="0"
 inkscape:window-maximized="1"
@@ -239,14 +56,14 @@
 inkscape:groupmode="layer"
 id="layer1"
 transform="translate(0,-1036.3622)"
- style="display:inline">
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:#000000;stroke-width:0.99977112;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2985"
- width="15.000229"
- height="15.000229"
- x="0.49988556"
- y="1036.8622" />
+ style="display:inline"
+ sodipodi:insensitive="true">
+ <path
+ style="display:inline"
+ d="m 14,1038.3622 -12,0 c -0.7333333,0 -1.3333333,0.6 -1.3333333,1.3333 l 0,9.3334 c 0,0.7333 0.6,1.32 1.3333333,1.32 l 12,0 c 0.733333,0 1.333333,-0.5867 1.333333,-1.32 l 0,-9.3334 c 0,-0.7333 -0.6,-1.3333 -1.333333,-1.3333 z m 0,10.6733 -12,0 0,-9.3533 12,0 z"
+ id="path4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssssssccccc" />
 </g>
 <g
 inkscape:groupmode="layer"
@@ -254,12 +71,12 @@
 inkscape:label="2.21:1"
 style="display:none">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect3163"
- width="12"
- height="6"
- x="2"
- y="5" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect3171-0-7-8-2"
+ width="10.375"
+ height="4.6945701"
+ x="2.8126667"
+ y="5.6460648" />
 </g>
 <g
 style="display:none"
@@ -267,12 +84,12 @@
 id="g3157"
 inkscape:groupmode="layer">
 <rect
- y="4"
- x="2"
- height="8"
- width="12"
- id="rect3159"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect3171-0-7-8"
+ width="10.375"
+ height="6.484375"
+ x="2.8126667"
+ y="4.7511625" />
 </g>
 <g
 inkscape:groupmode="layer"
@@ -280,12 +97,12 @@
 inkscape:label="16:9"
 style="display:none">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4038-2"
- width="12"
- height="6"
- x="2"
- y="5" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect3171-0-7"
+ width="10.375"
+ height="5.8359375"
+ x="2.8126667"
+ y="5.0753813" />
 </g>
 <g
 style="display:none"
@@ -293,12 +110,12 @@
 id="g3165"
 inkscape:groupmode="layer">
 <rect
- y="4"
- x="2"
- height="8"
- width="12"
- id="rect3167"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect3171-0"
+ width="10.374666"
+ height="7.78125"
+ x="2.8126667"
+ y="4.102725" />
 </g>
 <g
 inkscape:groupmode="layer"
@@ -306,12 +123,12 @@
 inkscape:label="5:4"
 style="display:none">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect3175"
- width="12"
- height="10"
- x="2"
- y="3" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect3171-1"
+ width="6.2248001"
+ height="7.78125"
+ x="4.8875999"
+ y="4.102725" />
 </g>
 <g
 inkscape:groupmode="layer"
@@ -319,12 +136,12 @@
 inkscape:label="1:1"
 style="display:inline">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
 id="rect3171"
- width="12"
- height="12"
- x="2"
- y="2" />
+ width="7.78125"
+ height="7.78125"
+ x="4.109375"
+ y="4.102725" />
 </g>
 <g
 inkscape:groupmode="layer"
@@ -339,9 +156,9 @@
 id="text3898-9"
 y="10.883301"
 x="5.7239423"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
 xml:space="preserve"><tspan
- style="font-weight:bold;stroke:#000000;stroke-opacity:1;-inkscape-font-specification:Sans Bold"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold';stroke:#000000;stroke-opacity:1"
 y="10.883301"
 x="5.7239423"
 id="tspan3900-9"
@@ -351,9 +168,9 @@
 id="text3892-7"
 y="10.902241"
 x="5.7016349"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none"
 xml:space="preserve"><tspan
- style="font-weight:bold;stroke:none;-inkscape-font-specification:Sans Bold"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold';stroke:none"
 y="10.902241"
 x="5.7016349"
 id="tspan3894-2"

sview-15_10.tar.gz/texturesSrc/menuSrcFormat.svg -> sview-15_11.tar.gz/texturesSrc/menuSrcFormat.svg Changed

@@ -14,7 +14,7 @@
 height="16"
 id="svg2"
 version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
 sodipodi:docname="menuSrcFormat.svg"
 inkscape:export-filename="/home/menuSbsLR16.png"
 inkscape:export-xdpi="90"
@@ -41,91 +41,7 @@
 style="stop-color:#000000;stop-opacity:1;" />
 </linearGradient>
 <linearGradient
- id="linearGradient4634">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4636" />
- <stop
- id="stop4642"
- offset="0.46642813"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.47303236"
- id="stop4644" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4638" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4634"
- id="linearGradient4640"
- x1="10.176364"
- y1="7.4030485"
- x2="14.850094"
- y2="7.4030485"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4634-3"
- id="linearGradient4640-7"
- x1="10.176364"
- y1="7.4030485"
- x2="14.850094"
- y2="7.4030485"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4634-3">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4636-4" />
- <stop
- id="stop4642-5"
- offset="0.46642813"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.47303236"
- id="stop4644-5" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4638-7" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4634-3"
- id="linearGradient4662"
- x1="10.176364"
- y1="7.4030485"
- x2="14.850094"
- y2="7.4030485"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- id="linearGradient4664">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4666" />
- <stop
- id="stop4668"
- offset="0.46642813"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.47303236"
- id="stop4670" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop4672" />
- </linearGradient>
- <linearGradient
- gradientTransform="translate(-10.601134,6.9138058)"
+ gradientTransform="matrix(1.126643,0,0,0.8875926,-11.954742,5.9491429)"
 y2="7.4030485"
 x2="14.850094"
 y1="7.4030485"
@@ -135,16 +51,6 @@
 xlink:href="#linearGradient4713"
 inkscape:collect="always" />
 <linearGradient
- gradientTransform="translate(-9.1593698,6.9138058)"
- y2="7.4030485"
- x2="14.850094"
- y1="7.4030485"
- x1="10.176364"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4676-8"
- xlink:href="#linearGradient4713-2"
- inkscape:collect="always" />
- <linearGradient
 id="linearGradient4713-2">
 <stop
 id="stop4715-9"
@@ -164,40 +70,11 @@
 style="stop-color:#000000;stop-opacity:1;" />
 </linearGradient>
 <linearGradient
- gradientTransform="translate(-9.1593698,6.9138058)"
- y2="7.4030485"
- x2="14.850094"
- y1="7.4030485"
- x1="10.176364"
- gradientUnits="userSpaceOnUse"
- id="linearGradient4757"
- xlink:href="#linearGradient4713-2"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient4759">
- <stop
- id="stop4761"
- offset="0"
- style="stop-color:#000000;stop-opacity:0;" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="0.46642813"
- id="stop4763" />
- <stop
- id="stop4765"
- offset="0.47303236"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop4767"
- offset="1"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
 y2="7.4030485"
 x2="14.850094"
 y1="7.4030485"
 x1="10.176364"
- gradientTransform="translate(-7.0215298,3.6524912)"
+ gradientTransform="translate(-7.0215298,2.8075088)"
 gradientUnits="userSpaceOnUse"
 id="linearGradient4771"
 xlink:href="#linearGradient4713-2"
@@ -208,19 +85,19 @@
 pagecolor="#ffffff"
 bordercolor="#666666"
 borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
 inkscape:pageshadow="2"
- inkscape:zoom="31.999999"
- inkscape:cx="8.3167614"
- inkscape:cy="6.1548109"
+ inkscape:zoom="7.9999998"
+ inkscape:cx="22.787657"
+ inkscape:cy="22.468716"
 inkscape:document-units="px"
- inkscape:current-layer="layer8"
+ inkscape:current-layer="layer3"
 showgrid="false"
- inkscape:window-width="1920"
- inkscape:window-height="1004"
- inkscape:window-x="-9"
- inkscape:window-y="-9"
- inkscape:window-maximized="1"
+ inkscape:window-width="2410"
+ inkscape:window-height="1233"
+ inkscape:window-x="90"
+ inkscape:window-y="28"
+ inkscape:window-maximized="0"
 inkscape:snap-grids="true" />
 <metadata
 id="metadata7">
@@ -230,7 +107,7 @@
 <dc:format>image/svg+xml</dc:format>
 <dc:type
 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
 </cc:Work>
 </rdf:RDF>
 </metadata>
@@ -239,244 +116,146 @@
 inkscape:groupmode="layer"
 id="layer1"
 transform="translate(0,-1036.3622)"
+ style="display:inline"
 sodipodi:insensitive="true">
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:#000000;stroke-width:0.99977112;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect2985"
- width="15.000229"
- height="15.000229"
- x="0.49988556"
- y="1036.8622" />
+ <path
+ d="m 14,1038.3622 -12,0 c -0.7333333,0 -1.3333333,0.6 -1.3333333,1.3333 l 0,9.3334 c 0,0.7333 0.6,1.32 1.3333333,1.32 l 12,0 c 0.733333,0 1.333333,-0.5867 1.333333,-1.32 l 0,-9.3334 c 0,-0.7333 -0.6,-1.3333 -1.333333,-1.3333 z m 0,10.6733 -12,0 0,-9.3533 12,0 z"
+ id="path4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssssssccccc" />
 </g>
 <g
 inkscape:groupmode="layer"
 id="layer2"
 inkscape:label="ParallelPairLR"
 style="display:none">
- <g
- id="g3839">
- <rect
- y="1039.3622"
- x="1"
- height="10"
- width="7"
- id="rect3774"
- style="fill:#808080;fill-opacity:1;stroke:none"
- transform="translate(0,-1036.3622)" />
- <text
- sodipodi:linespacing="125%"
- id="text3776"
- y="1047.2446"
- x="1.6855963"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- transform="translate(0,-1036.3622)"><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- y="1047.2446"
- x="1.6855963"
- id="tspan3778"
- sodipodi:role="line">L</tspan></text>
- <rect
- y="1039.3622"
- x="8"
- height="10"
- width="7"
- id="rect3774-5"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none"
- transform="translate(0,-1036.3622)" />
- <text
- sodipodi:linespacing="125%"
- id="text3776-6"
- y="1047.2446"
- x="8.1759539"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"
- transform="translate(0,-1036.3622)"><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- y="1047.2446"
- x="8.1759539"
- id="tspan3778-6"
- sodipodi:role="line">R</tspan></text>
- <rect
- transform="translate(0,-1036.3622)"
- style="fill:#808080;fill-opacity:1;stroke:none"
- id="rect3827"
- width="7"
- height="10"
- x="1"
- y="1039.3622" />
- <text
- transform="translate(0,-1036.3622)"
- xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
+ <rect
+ style="fill:#808080;fill-opacity:1;stroke:none"
+ id="rect3774"
+ width="7"
+ height="10"
+ x="1"
+ y="2.9999826" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none"
+ x="1.6855963"
+ y="10.882429"
+ id="text3776"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3778"
 x="1.6855963"
- y="1047.2446"
- id="text3829"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3831"
- x="1.6855963"
- y="1047.2446"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
- <rect
- transform="translate(0,-1036.3622)"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none"
- id="rect3833"
- width="7"
- height="10"
- x="8"
- y="1039.3622" />
- <text
- transform="translate(0,-1036.3622)"
- xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="8.1759539"
- y="1047.2446"
- id="text3835"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3837"
- x="8.1759539"
- y="1047.2446"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
- </g>
+ y="10.882429"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold'">L</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="7.9103289"
+ y="10.882429"
+ id="text3776-6"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3778-6"
+ x="7.9103289"
+ y="10.882429"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">R</tspan></text>
+ <rect
+ y="2.9999826"
+ x="1"
+ height="10"
+ width="7"
+ id="rect3827"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text3829"
+ y="10.882429"
+ x="2.0605965"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'"
+ y="10.882429"
+ x="2.0605965"
+ id="tspan3831"
+ sodipodi:role="line">L</tspan></text>
 </g>
 <g
 inkscape:groupmode="layer"
 id="layer3"
 inkscape:label="ParallelPairRL"
 style="display:none">
- <g
- id="g3927"
- transform="translate(7,0)">
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none"
- id="rect3878"
- width="7"
- height="10"
- x="1"
- y="2.9999826" />
- <text
- xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- x="1.6855963"
- y="10.882429"
- id="text3880"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3882"
- x="1.6855963"
- y="10.882429"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
- <rect
- y="2.9999826"
- x="1"
- height="10"
- width="7"
- id="rect3890"
- style="fill:#808080;fill-opacity:1;stroke:none" />
- <text
- sodipodi:linespacing="125%"
- id="text3892"
- y="10.882429"
- x="1.6855963"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- y="10.882429"
- x="1.6855963"
- id="tspan3894"
- sodipodi:role="line">L</tspan></text>
- </g>
- <g
- id="g3935"
- transform="translate(-7,0)">
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none"
- id="rect3884"
- width="7"
- height="10"
- x="8"
- y="2.9999826" />
- <text
- xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="8.1759539"
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ x="1.8009539"
+ y="10.882429"
+ id="text3776-6-4"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3778-6-2"
+ x="1.8009539"
 y="10.882429"
- id="text3886"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3888"
- x="8.1759539"
- y="10.882429"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
- <rect
- y="2.9999826"
- x="8"
- height="10"
- width="7"
- id="rect3896"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none" />
- <text
- sodipodi:linespacing="125%"
- id="text3898"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">R</tspan></text>
+ <rect
+ y="2.9999831"
+ x="8"
+ height="10"
+ width="7"
+ id="rect3827-3"
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text3829-83"
+ y="10.882429"
+ x="8.6074715"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fcfcfc;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'"
 y="10.882429"
- x="8.1759539"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- y="10.882429"
- x="8.1759539"
- id="tspan3900"
- sodipodi:role="line">R</tspan></text>
- </g>
+ x="8.6074715"
+ id="tspan3831-5"
+ sodipodi:role="line">L</tspan></text>
 </g>
 <g
 inkscape:groupmode="layer"
 id="layer4"
 inkscape:label="OverUnderLR"
 style="display:none">
- <g
- id="g4011">
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none"
- id="rect3827-3"
- width="10"
- height="7"
- x="3"
- y="1" />
- <text
- xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- x="5.1951499"
- y="7.3130155"
- id="text3829-0"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3831-8"
- x="5.1951499"
- y="7.3130155"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none"
- id="rect3833-7"
- width="10"
- height="7"
- x="3"
- y="8" />
- <text
- xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="5.1951499"
- y="14.431433"
- id="text3835-2"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3837-9"
- x="5.1951499"
- y="14.431433"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
- </g>
+ <rect
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ id="rect4038-9"
+ width="13.046875"
+ height="5.078125"
+ x="1.4765624"
+ y="3.062501" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:8.81972408px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fcfcfc;fill-opacity:1;stroke:none"
+ x="4.9363327"
+ y="8.2299852"
+ id="text4040-0"
+ sodipodi:linespacing="125%"
+ transform="scale(1.1024655,0.90705786)"><tspan
+ sodipodi:role="line"
+ id="tspan4042-5"
+ x="4.9363327"
+ y="8.2299852"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.51232767px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">L</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:8.81972408px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ x="4.9363327"
+ y="13.543103"
+ id="text4046-6"
+ sodipodi:linespacing="125%"
+ transform="scale(1.1024655,0.90705786)"><tspan
+ sodipodi:role="line"
+ id="tspan4048-6"
+ x="4.9363327"
+ y="13.543103"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.51232767px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'"
+ dx="0">R</tspan></text>
 </g>
 <g
 inkscape:groupmode="layer"
@@ -484,251 +263,63 @@
 inkscape:label="OverUnderRL"
 style="display:none">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none"
+ style="fill:#000000;fill-opacity:1;stroke:none"
 id="rect4038"
- width="10"
- height="7"
- x="3"
+ width="13.046875"
+ height="5.078125"
+ x="1.4765624"
 y="8" />
 <text
 xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- x="5.1951499"
- y="14.449447"
+ style="font-style:normal;font-weight:normal;font-size:8.81972408px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none"
+ x="4.9363327"
+ y="13.673408"
 id="text4040"
- sodipodi:linespacing="125%"><tspan
+ sodipodi:linespacing="125%"
+ transform="scale(1.1024655,0.90705785)"><tspan
 sodipodi:role="line"
 id="tspan4042"
- x="5.1951499"
- y="14.449447"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none"
- id="rect4044"
- width="10"
- height="7"
- x="3"
- y="1" />
+ x="4.9363327"
+ y="13.673408"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.51232767px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">L</tspan></text>
 <text
 xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="5.1951499"
- y="7.3468785"
+ style="font-style:normal;font-weight:normal;font-size:8.81972408px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="4.9363327"
+ y="8.2374878"
 id="text4046"
- sodipodi:linespacing="125%"><tspan
+ sodipodi:linespacing="125%"
+ transform="scale(1.1024655,0.90705785)"><tspan
 sodipodi:role="line"
 id="tspan4048"
- x="5.1951499"
- y="7.3468785"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
+ x="4.9363327"
+ y="8.2374878"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.51232767px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'"
+ dx="0">R</tspan></text>
 </g>
 <g
 style="display:none"
 inkscape:label="RowInterlacedLR"
 id="g4213"
 inkscape:groupmode="layer">
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4229-19"
- width="14"
- height="2"
- x="33.570251"
- y="17.143837" />
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4235-8"
- width="14"
- height="2"
- x="33.570251"
- y="15.143854" />
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4229-1-3"
- width="14"
- height="2"
- x="33.570251"
- y="13.143853" />
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4235-0-0"
- width="14"
- height="2"
- x="33.570251"
- y="11.143853" />
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4229-1-0-2"
- width="14"
- height="2"
- x="33.570251"
- y="9.1438532" />
- <text
- sodipodi:linespacing="125%"
- id="text4225"
- y="13.8001"
- x="4.3218513"
- style="font-size:14.12289143px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- y="13.8001"
- x="4.3218513"
- id="tspan4227"
- sodipodi:role="line">R</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4219"
- y="11.976875"
- x="0.50540578"
- style="font-size:13.88040066px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;-inkscape-font-specification:Sans Bold"
- y="11.976875"
- x="0.50540578"
- id="tspan4221"
- sodipodi:role="line">L</tspan></text>
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:none"
- id="rect4235"
- width="4.0121169"
- height="2"
- x="1"
- y="7.9393387" />
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline"
- id="rect4235-0"
- width="3.9679224"
- height="2"
- x="1"
- y="3.9393387" />
- <g
- id="g4337"
- transform="matrix(0.99775258,0,0,1,0.03371084,-0.9999828)">
- <rect
- y="10.999983"
- x="9.1759224"
- height="2"
- width="5.8240776"
- id="rect4229"
- style="fill:#c8c8c8;fill-opacity:1;stroke:none" />
- <rect
- y="7"
- x="4.9774756"
- height="2"
- width="10.022524"
- id="rect4229-1"
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="3"
- x="5.0658641"
- height="2"
- width="9.9341364"
- id="rect4229-1-0"
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline" />
- </g>
+ <path
+ style="fill:#000000;fill-opacity:1"
+ d="m 1.5129445,2.8429648 0,9.9687502 0.0625,0 0,0.15625 13.0937435,0 0,-0.15625 0.15625,0 0,-9.9687502 z m 5.4886262,0.5664062 4.8144463,0 c 0.58758,0.095058 1.068622,0.257645 1.412109,0.5058594 0.338062,0.242522 0.56092,0.5815198 0.695313,0.9941406 0.05602,0.2747396 0.07677,0.5494792 0.07031,0.8242188 l -2.34375,0 C 11.598383,5.5476543 11.521967,5.3869146 11.396095,5.2824179 11.184507,5.1033818 10.833758,5.0148398 10.341408,5.0148398 l -0.9902283,0 0,0.71875 -2.349609,0 z m -5.0445394,2.34375 1.892578,0 0,2.3242188 -1.892578,0 z m 5.0445394,2.3437498 5.4921813,0 c -0.05729,0.02309 -0.113326,0.04689 -0.175782,0.06641 0.321452,0.07324 0.60905,0.241538 0.861328,0.501954 0.235628,0.235627 0.473792,0.598024 0.712891,1.0605462 0.07315,0.2175237 0.115522,0.446589 0.105469,0.695313 l -2.251953,0 -0.128907,-0.261719 c -0.223795,-0.455729 -0.45166,-0.7667652 -0.683593,-0.9335942 -0.227865,-0.166828 -0.533529,-0.25 -0.916016,-0.25 l -0.6660093,0 0,1.4453132 -2.349609,0 z m -5.0445394,2.3437502 1.892578,0 0,0.421875 3.246094,0 0,1.5625 -5.138672,0 z"
+ id="path4333"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccsccccccccccccccccccsccccccccccc" />
 </g>
 <g
 inkscape:groupmode="layer"
 id="g4342"
 inkscape:label="RowInterlacedRL"
 style="display:none">
- <rect
- y="17.143837"
- x="33.570251"
- height="2"
- width="14"
- id="rect4344"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="15.143854"
- x="33.570251"
- height="2"
- width="14"
- id="rect4346"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="13.143853"
- x="33.570251"
- height="2"
- width="14"
- id="rect4348"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="11.143853"
- x="33.570251"
- height="2"
- width="14"
- id="rect4350"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="9.1438532"
- x="33.570251"
- height="2"
- width="14"
- id="rect4352"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
- <text
- xml:space="preserve"
- style="font-size:14.12289143px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="4.3218513"
- y="11.8001"
- id="text4354"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan4356"
- x="4.3218513"
- y="11.8001"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:13.88040066px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
- x="0.50540578"
- y="13.976875"
- id="text4358"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan4360"
- x="0.50540578"
- y="13.976875"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
- <rect
- y="9.9393387"
- x="1"
- height="2"
- width="4.0121169"
- id="rect4362"
- style="fill:#c8c8c8;fill-opacity:1;stroke:none" />
- <rect
- y="5.9393387"
- x="1"
- height="2"
- width="3.9679224"
- id="rect4364"
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline" />
- <g
- transform="matrix(0.99775258,0,0,1,0.03371084,1.0000172)"
- id="g4366">
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:none"
- id="rect4368"
- width="5.8240776"
- height="2"
- x="9.1759224"
- y="10.999983" />
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline"
- id="rect4370"
- width="10.022524"
- height="2"
- x="4.9774756"
- y="7" />
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline"
- id="rect4372"
- width="9.9341364"
- height="2"
- x="5.0658641"
- y="3" />
- </g>
+ <path
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 1.3125,2.7500001 0,10.4374999 13.125,0 0,-10.4374999 z m 0.679688,0.7617187 2.349609,0 0,2.2265624 -2.349609,0 z m 3.796874,2.2265624 2.34961,0 0,1.7089844 0.990234,0 c 0.492351,0 0.843099,-0.090332 1.054688,-0.2734375 0.215657,-0.1831054 0.324219,-0.4851888 0.324218,-0.9042969 2e-6,-0.2067769 -0.0285,-0.3830521 -0.08203,-0.53125 l 2.416016,0 c 0.0032,0.062925 0.01563,0.1180152 0.01563,0.1835938 0,0.6022135 -0.146484,1.0958659 -0.439453,1.4824219 -0.205156,0.2745037 -0.488733,0.4957755 -0.84375,0.6679691 l -5.785157,0 z m -3.796874,2.3535158 2.349609,0 0,2.333984 -2.349609,0 z m 3.796874,2.333984 2.34961,0 0,2.09375 -2.34961,0 z m 4.699219,0 2.498047,0 1.03125,2.09375 -2.503906,0 z"
+ id="text4360"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccsccccsccccccccccccccccccc" />
 </g>
 <g
 style="display:none"
@@ -736,64 +327,36 @@
 id="g4374"
 inkscape:groupmode="layer">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4376"
- width="14"
- height="2"
- x="33.570251"
- y="17.143837" />
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4378"
- width="14"
- height="2"
- x="33.570251"
- y="15.143854" />
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4380"
- width="14"
- height="2"
- x="33.570251"
- y="13.143853" />
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4382"
- width="14"
- height="2"
- x="33.570251"
- y="11.143853" />
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4384"
- width="14"
- height="2"
- x="33.570251"
- y="9.1438532" />
+ style="fill:#c8c8c8;fill-opacity:1;stroke:none"
+ id="rect4451"
+ width="11.993893"
+ height="9.347373"
+ x="1.9983507"
+ y="3.3179572" />
 <text
 sodipodi:linespacing="125%"
 id="text4386"
- y="11.8001"
- x="4.3218513"
- style="font-size:14.12289143px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;fill:#ff0000;fill-opacity:1;-inkscape-font-specification:Sans Bold"
- y="11.8001"
- x="4.3218513"
+ y="12.50611"
+ x="4.6938848"
+ style="font-style:normal;font-weight:normal;font-size:14.3184557px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ xml:space="preserve"
+ transform="scale(0.98634179,1.0138473)"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.67309189px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#ff0000;fill-opacity:1"
+ y="12.50611"
+ x="4.6938848"
 id="tspan4388"
 sodipodi:role="line">R</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4390"
- y="13.976875"
- x="0.50540578"
- style="font-size:13.88040066px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#00fcfc;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;fill:#00fcfc;fill-opacity:1;-inkscape-font-specification:Sans Bold"
- y="13.976875"
- x="0.50540578"
- id="tspan4392"
- sodipodi:role="line">L</tspan></text>
+ <g
+ transform="scale(0.9763953,1.0241754)"
+ style="font-style:normal;font-weight:normal;font-size:14.21596432px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#00fcfc;fill-opacity:1;stroke:none"
+ id="text4390">
+ <path
+ d="m 2.0462289,12.376119 0,-9.1390649 1.9378318,0 0,7.5387909 4.3439775,0 0,1.600274 z"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.80219173px;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#00fcfc;fill-opacity:1"
+ id="path4449"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
 </g>
 <g
 inkscape:groupmode="layer"
@@ -801,64 +364,36 @@
 inkscape:label="AnaglyphYellowBlue"
 style="display:none">
 <rect
- y="17.143837"
- x="33.570251"
- height="2"
- width="14"
- id="rect4408"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="15.143854"
- x="33.570251"
- height="2"
- width="14"
- id="rect4410"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="13.143853"
- x="33.570251"
- height="2"
- width="14"
- id="rect4412"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="11.143853"
- x="33.570251"
- height="2"
- width="14"
- id="rect4414"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="9.1438532"
- x="33.570251"
- height="2"
- width="14"
- id="rect4416"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
- <text
- xml:space="preserve"
- style="font-size:14.12289143px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffff00;fill-opacity:1;stroke:none;font-family:Sans"
- x="4.3218513"
- y="11.8001"
- id="text4418"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan4420"
- x="4.3218513"
- y="11.8001"
- style="font-weight:bold;fill:#ffff00;fill-opacity:1;-inkscape-font-specification:Sans Bold">R</tspan></text>
+ style="display:inline;fill:#c8c8c8;fill-opacity:1;stroke:none"
+ id="rect4451-6-9"
+ width="11.993893"
+ height="9.347373"
+ x="1.9983507"
+ y="3.3179576" />
 <text
+ sodipodi:linespacing="125%"
+ id="text4386-5-6"
+ y="12.50611"
+ x="4.6938848"
+ style="font-style:normal;font-weight:normal;font-size:14.3184557px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffff00;fill-opacity:1;stroke:none"
 xml:space="preserve"
- style="font-size:13.88040066px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans"
- x="0.50540578"
- y="13.976875"
- id="text4422"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan4424"
- x="0.50540578"
- y="13.976875"
- style="font-weight:bold;fill:#0000ff;fill-opacity:1;-inkscape-font-specification:Sans Bold">L</tspan></text>
+ transform="scale(0.98634182,1.0138473)"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.67309189px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#ffff00;fill-opacity:1"
+ y="12.50611"
+ x="4.6938848"
+ id="tspan4388-9-9"
+ sodipodi:role="line">R</tspan></text>
+ <g
+ transform="scale(0.9763953,1.0241754)"
+ style="font-style:normal;font-weight:normal;font-size:14.21596432px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#0000ff;fill-opacity:1;stroke:none"
+ id="text4390-6-7">
+ <path
+ d="m 2.0462289,12.376119 0,-9.1390649 1.9378318,0 0,7.5387909 4.3439775,0 0,1.600274 z"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.80219173px;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#0000ff;fill-opacity:1"
+ id="path4449-8-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
 </g>
 <g
 style="display:none"
@@ -866,64 +401,36 @@
 id="g4426"
 inkscape:groupmode="layer">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4428"
- width="14"
- height="2"
- x="33.570251"
- y="17.143837" />
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4430"
- width="14"
- height="2"
- x="33.570251"
- y="15.143854" />
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4432"
- width="14"
- height="2"
- x="33.570251"
- y="13.143853" />
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4434"
- width="14"
- height="2"
- x="33.570251"
- y="11.143853" />
- <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
- id="rect4436"
- width="14"
- height="2"
- x="33.570251"
- y="9.1438532" />
+ style="display:inline;fill:#c8c8c8;fill-opacity:1;stroke:none"
+ id="rect4451-6"
+ width="11.993893"
+ height="9.347373"
+ x="1.9983507"
+ y="3.3179574" />
 <text
 sodipodi:linespacing="125%"
- id="text4438"
- y="11.8001"
- x="4.3218513"
- style="font-size:14.12289143px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#00ff00;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;fill:#00ff00;fill-opacity:1;-inkscape-font-specification:Sans Bold"
- y="11.8001"
- x="4.3218513"
- id="tspan4440"
+ id="text4386-5"
+ y="12.50611"
+ x="4.6938848"
+ style="font-style:normal;font-weight:normal;font-size:14.3184557px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#00ff00;fill-opacity:1;stroke:none"
+ xml:space="preserve"
+ transform="scale(0.98634182,1.0138473)"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.67309189px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#00ff00;fill-opacity:1"
+ y="12.50611"
+ x="4.6938848"
+ id="tspan4388-9"
 sodipodi:role="line">R</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text4442"
- y="13.976875"
- x="0.50540578"
- style="font-size:13.88040066px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;font-family:Sans"
- xml:space="preserve"><tspan
- style="font-weight:bold;fill:#ff00ff;fill-opacity:1;-inkscape-font-specification:Sans Bold"
- y="13.976875"
- x="0.50540578"
- id="tspan4444"
- sodipodi:role="line">L</tspan></text>
+ <g
+ transform="scale(0.9763953,1.0241754)"
+ style="font-style:normal;font-weight:normal;font-size:14.21596432px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ff00ff;fill-opacity:1;stroke:none"
+ id="text4390-6">
+ <path
+ d="m 2.0462289,12.376119 0,-9.1390649 1.9378318,0 0,7.5387909 4.3439775,0 0,1.600274 z"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.80219173px;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans Bold';fill:#ff00ff;fill-opacity:1"
+ id="path4449-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
 </g>
 <g
 style="display:none"
@@ -931,181 +438,145 @@
 id="g4446"
 inkscape:groupmode="layer">
 <rect
- y="2"
- x="2"
- height="8"
+ y="3.3197443"
+ x="1.9974341"
+ height="7"
 width="8"
 id="rect4448"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#c8c8c8;fill-opacity:1;stroke:none" />
 <rect
- y="3"
- x="3"
- height="8"
+ y="4.3200002"
+ x="2.9974341"
+ height="7"
 width="8"
 id="rect4448-2"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none" />
 <rect
- y="4"
- x="4"
- height="8"
+ y="5.3200002"
+ x="3.9974341"
+ height="7"
 width="8"
 id="rect4448-0"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#c8c8c8;fill-opacity:1;stroke:none" />
 <rect
- y="5"
- x="5"
- height="8"
- width="8"
+ y="6.3200002"
+ x="4.975337"
+ height="7"
+ width="8.0055246"
 id="rect4448-2-9"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
- <rect
- y="6"
- x="6"
- height="8"
- width="8"
- id="rect4448-0-5"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none" />
 <text
 xml:space="preserve"
- style="font-size:6px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#f2f2f2;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
- x="8.3085041"
- y="12.155107"
+ style="font-style:italic;font-weight:normal;font-size:6px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Italic';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="6.9917712"
+ y="11.926445"
 id="text4537"
 sodipodi:linespacing="125%"><tspan
 sodipodi:role="line"
 id="tspan4539"
- x="8.3085041"
- y="12.155107"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold Italic">t</tspan></text>
+ x="6.9917712"
+ y="11.926445"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold Italic';fill:#ffffff;fill-opacity:1">t</tspan></text>
 </g>
 <g
 inkscape:groupmode="layer"
 id="layer8"
- inkscape:label="DualStream">
+ inkscape:label="DualStream"
+ style="display:none">
 <rect
- y="2"
- x="2"
- height="8"
+ y="2.953125"
+ x="1.9558058"
+ height="7.484375"
 width="8"
 id="rect4448-1"
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none" />
 <text
 xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fcfcfc;fill-opacity:1;stroke:none"
 x="3.3710938"
- y="8.8398438"
+ y="9.2773438"
 id="text3829-8"
 sodipodi:linespacing="125%"><tspan
 sodipodi:role="line"
 id="tspan3831-2"
 x="3.3710938"
- y="8.8398438"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
+ y="9.2773438"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold'">L</tspan></text>
 <rect
- y="6"
- x="6"
- height="8"
- width="8"
+ y="5.59375"
+ x="6.390625"
+ height="6.6741753"
+ width="7.15625"
 id="rect4448-2-9-0"
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline" />
+ style="display:inline;fill:#fcfcfc;fill-opacity:1;stroke:none" />
 <text
 xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
- x="6.8398438"
- y="12.863281"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ x="6.852788"
+ y="12.146106"
 id="text3835-4"
 sodipodi:linespacing="125%"><tspan
 sodipodi:role="line"
 id="tspan3837-5"
- x="6.8398438"
- y="12.863281"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">R</tspan></text>
+ x="6.852788"
+ y="12.146106"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold'">R</tspan></text>
 </g>
 <g
 inkscape:groupmode="layer"
 id="g4541"
 inkscape:label="Tiled720in1080"
 style="display:none">
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4545"
- width="4"
- height="7"
- x="9.9384851"
- y="2.9835343" />
- <text
- xml:space="preserve"
- style="font-size:7.10074091px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4640);fill-opacity:1;stroke:none;display:inline;font-family:Sans"
- x="9.524538"
- y="9.9912825"
+ <path
+ style="font-style:normal;font-weight:normal;font-size:7.10074091px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+ d="m 11.464844,4.075865 0,4.5957031 1.503906,0 0,-1.7402344 0.425781,0 c 0.244792,0 0.440104,0.042837 0.585938,0.1269532 0.122473,0.069403 0.2424,0.2005748 0.361328,0.3691406 l 0,-1.5292969 c -0.02265,0.024202 -0.03589,0.057066 -0.06445,0.076172 -0.135417,0.092323 -0.360677,0.1386719 -0.675782,0.1386719 l -0.632812,0 0,-1.1777344 0.632812,0 c 0.315105,0 0.540365,0.044494 0.675782,0.1347656 0.02849,0.018632 0.04185,0.050517 0.06445,0.074219 l 0,-1.0234375 C 14.15328,4.1036309 13.98499,4.075865 13.761719,4.075865 l -2.296875,0 z"
 id="text4046-0"
- sodipodi:linespacing="125%"
- transform="scale(1.126643,0.88759259)"><tspan
- sodipodi:role="line"
- id="tspan4048-7"
- x="9.524538"
- y="9.9912825"
- style="font-weight:bold;fill:url(#linearGradient4640);fill-opacity:1;-inkscape-font-specification:Sans Bold">R</tspan></text>
- <rect
- style="fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline"
- id="rect4545-2"
- width="8"
- height="3"
- x="2"
- y="10" />
- <text
- xml:space="preserve"
- style="font-size:7.10074091px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4676);fill-opacity:1;stroke:none;display:inline;font-family:Sans"
- x="-1.0765914"
- y="16.905088"
+ inkscape:connector-curvature="0" />
+ <path
+ style="font-style:normal;font-weight:normal;font-size:7.10074091px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4676);fill-opacity:1;stroke:none"
+ d="m -0.49023438,10.222656 0,2.771485 4.02734378,0 c -0.024473,-0.02223 -0.049804,-0.05303 -0.074219,-0.07227 -0.1614583,-0.131303 -0.3450521,-0.215024 -0.5507812,-0.251953 0.375,-0.09232 0.6549479,-0.236737 0.8398437,-0.431641 0.1875,-0.194903 0.28125,-0.444407 0.28125,-0.748047 0,-0.439046 -0.1796875,-0.75978 -0.5390625,-0.96289 -0.3567708,-0.20311 -0.9192708,-0.304688 -1.6875,-0.304688 l -2.29687498,0 z m 1.50390628,0.859375 0.6328125,0 c 0.3151041,0 0.5403646,0.04449 0.6757812,0.134766 0.1380209,0.09027 0.2070313,0.239954 0.2070313,0.449219 0,0.211316 -0.06901,0.362755 -0.2070313,0.455078 -0.1354166,0.09232 -0.3606771,0.138672 -0.6757812,0.138672 l -0.6328125,0 0,-1.177735 z"
 id="text4046-0-6"
- sodipodi:linespacing="125%"
- transform="scale(1.126643,0.8875926)"><tspan
- sodipodi:role="line"
- id="tspan4048-7-4"
- x="-1.0765914"
- y="16.905088"
- style="font-weight:bold;fill:url(#linearGradient4676);fill-opacity:1;-inkscape-font-specification:Sans Bold">R</tspan></text>
- <rect
- style="fill:#c8c8c8;fill-opacity:1;stroke:none;display:inline"
- id="rect4545-2-6"
- width="10"
- height="2"
- x="1"
- y="13" />
+ inkscape:connector-curvature="0" />
 <text
 xml:space="preserve"
- style="font-size:7.10074091px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4771);fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:7.10074091px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#linearGradient4771);fill-opacity:1;stroke:none"
 x="2.5030084"
- y="13.643773"
+ y="12.798787"
 id="text4046-0-6-0"
 sodipodi:linespacing="125%"
 transform="scale(1.126643,0.8875926)"><tspan
 sodipodi:role="line"
 id="tspan4048-7-4-2"
 x="2.5030084"
- y="13.643773"
- style="font-weight:bold;fill:url(#linearGradient4771);fill-opacity:1;-inkscape-font-specification:Sans Bold">R</tspan></text>
+ y="12.798787"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold';fill:url(#linearGradient4771);fill-opacity:1">R</tspan></text>
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
 id="rect4543"
 width="8"
 height="7"
- x="2"
- y="3" />
+ x="1.9779029"
+ y="2.25" />
 <text
 xml:space="preserve"
- style="font-size:7.10074091px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:7.10074091px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fcfcfc;fill-opacity:1;stroke:none"
 x="2.8952723"
- y="9.9912825"
+ y="9.7686882"
 id="text4040-6"
 sodipodi:linespacing="125%"
- transform="scale(1.126643,0.88759259)"><tspan
+ transform="scale(1.126643,0.8875926)"><tspan
 sodipodi:role="line"
 id="tspan4042-9"
 x="2.8952723"
- y="9.9912825"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">L</tspan></text>
+ y="9.7686882"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold'">L</tspan></text>
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ id="rect4438"
+ width="4.0234375"
+ height="3.4296875"
+ x="9.984374"
+ y="9.2460938" />
 </g>
 <g
 inkscape:groupmode="layer"
@@ -1113,15 +584,15 @@
 inkscape:label="Mono"
 style="display:none">
 <rect
- style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
 id="rect4038-2"
- width="12"
- height="10"
- x="2"
- y="3" />
+ width="12.546875"
+ height="10.328125"
+ x="1.78125"
+ y="2.90625" />
 <text
 xml:space="preserve"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#fcfcfc;fill-opacity:1;stroke:none"
 x="4.029417"
 y="10.972326"
 id="text4040-8"
@@ -1130,24 +601,25 @@
 id="tspan4042-0"
 x="4.029417"
 y="10.972326"
- style="font-weight:bold;-inkscape-font-specification:Sans Bold">M</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">M</tspan></text>
 </g>
 <g
 inkscape:groupmode="layer"
 id="layer6"
 inkscape:label="Auto"
- style="display:none">
+ style="display:inline">
 <g
 id="g4207"
- transform="matrix(1.3040276,0,0,1.3040276,-3.4954074,-2.6287988)">
+ transform="matrix(1.3040276,0,0,1.3040276,-3.4954074,-2.3787988)"
+ style="fill:#000000;fill-opacity:1;stroke:none">
 <text
 sodipodi:linespacing="125%"
 id="text3898-9"
 y="10.883301"
 x="5.7239423"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
 xml:space="preserve"><tspan
- style="font-weight:bold;stroke:#000000;stroke-opacity:1;-inkscape-font-specification:Sans Bold"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
 y="10.883301"
 x="5.7239423"
 id="tspan3900-9"
@@ -1157,9 +629,9 @@
 id="text3892-7"
 y="10.902241"
 x="5.7016349"
- style="font-size:8px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fcfcfc;fill-opacity:1;stroke:none;font-family:Sans"
+ style="font-style:normal;font-weight:normal;font-size:8px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
 xml:space="preserve"><tspan
- style="font-weight:bold;stroke:none;-inkscape-font-specification:Sans Bold"
+ style="font-weight:bold;-inkscape-font-specification:'Sans Bold';fill:#000000;fill-opacity:1;stroke:none"
 y="10.902241"
 x="5.7016349"
 id="tspan3894-2"

Changes of Revision 3